You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/05/22 18:28:57 UTC
[01/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes [Forced Update!]
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2580 82cdd7bf5 -> 2ccedd062 (forced update)
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
index 1ebe89a..c69013b 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
@@ -434,7 +434,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
}
}
- private static final class TestCommandRequest extends CommandRequest {
+ private static class TestCommandRequest extends CommandRequest {
private final Map<String, String> commandParameters = new TreeMap<String, String>();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
index a704654..4571f2c 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
@@ -186,7 +186,7 @@ public class SimpleHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
}
}
- private static final class TestCommandRequest extends CommandRequest {
+ private static class TestCommandRequest extends CommandRequest {
private final String command;
[37/69] [abbrv] geode git commit: LuceneClientSecurityDUnitTest was
not testing anything
Posted by ud...@apache.org.
LuceneClientSecurityDUnitTest was not testing anything
This test was just creating lambdas without executing them. Changing the
test to actually run some tests.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3034ef64
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3034ef64
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3034ef64
Branch: refs/heads/feature/GEODE-2580
Commit: 3034ef64fdefee6266a21dc47d8d3a8be68d1959
Parents: 973eb33
Author: Dan Smith <up...@apache.org>
Authored: Fri May 12 15:34:02 2017 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Tue May 16 13:57:30 2017 -0700
----------------------------------------------------------------------
.../lucene/LuceneClientSecurityDUnitTest.java | 88 ++++++++------------
1 file changed, 35 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/3034ef64/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
index 67103ff..3e6b541 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.security.templates.UserPasswordAuthInit;
-import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -34,6 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import java.io.IOException;
import java.util.Properties;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
@@ -52,10 +52,7 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase {
public void verifySearchIndexPermissions(
LuceneCommandsSecurityDUnitTest.UserNameAndExpectedResponse user) {
// Start server
- int serverPort = dataStore1.invoke(startCacheServer());
-
- // Create index and region
- dataStore1.invoke(() -> createIndexAndRegion());
+ int serverPort = dataStore1.invoke(() -> startCacheServer());
// Start client
accessor.invoke(() -> startClient(user.getUserName(), serverPort));
@@ -65,58 +62,43 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase {
() -> executeTextSearch(user.getExpectAuthorizationError(), user.getExpectedResponse()));
}
- private SerializableCallableIF<Integer> startCacheServer() {
- return () -> {
- Properties props = new Properties();
- props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
- final Cache cache = getCache(props);
- final CacheServer server = cache.addCacheServer();
- server.setPort(0);
- server.start();
- LuceneService luceneService = LuceneServiceProvider.get(cache);
- luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
- cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
- return server.getPort();
- };
- }
-
- private SerializableRunnableIF createIndexAndRegion() {
- return () -> {
- Cache cache = getCache();
- LuceneService luceneService = LuceneServiceProvider.get(cache);
- luceneService.createIndexFactory().setFields("field1").create(INDEX_NAME, REGION_NAME);
- cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
- };
+ private int startCacheServer() throws IOException {
+ Properties props = new Properties();
+ props.setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
+ final Cache cache = getCache(props);
+ final CacheServer server = cache.addCacheServer();
+ server.setPort(0);
+ server.start();
+ LuceneService luceneService = LuceneServiceProvider.get(cache);
+ luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
+ cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+ return server.getPort();
}
- private SerializableRunnableIF startClient(String userName, int serverPort) {
- return () -> {
- Properties props = new Properties();
- props.setProperty("security-username", userName);
- props.setProperty("security-password", userName);
- props.setProperty(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName());
- ClientCacheFactory clientCacheFactory = new ClientCacheFactory(props);
- clientCacheFactory.addPoolServer("localhost", serverPort);
- ClientCache clientCache = getClientCache(clientCacheFactory);
- clientCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(REGION_NAME);
- };
+ private void startClient(String userName, int serverPort) {
+ Properties props = new Properties();
+ props.setProperty("security-username", userName);
+ props.setProperty("security-password", userName);
+ props.setProperty(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName());
+ ClientCacheFactory clientCacheFactory = new ClientCacheFactory(props);
+ clientCacheFactory.addPoolServer("localhost", serverPort);
+ ClientCache clientCache = getClientCache(clientCacheFactory);
+ clientCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(REGION_NAME);
}
- private SerializableRunnableIF executeTextSearch(boolean expectAuthorizationError,
- String expectedResponse) {
- return () -> {
- LuceneService service = LuceneServiceProvider.get(getCache());
- LuceneQuery<Integer, TestObject> query =
- service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "test", "text");
- try {
- query.findKeys();
- assertFalse(expectAuthorizationError);
- } catch (ServerOperationException e) {
- assertTrue(e.getCause() != null && e.getCause() instanceof NotAuthorizedException);
- assertTrue(expectAuthorizationError);
- assertTrue(e.getLocalizedMessage().contains(expectedResponse));
- }
- };
+ private void executeTextSearch(boolean expectAuthorizationError, String expectedResponse)
+ throws LuceneQueryException {
+ LuceneService service = LuceneServiceProvider.get(getCache());
+ LuceneQuery<Integer, TestObject> query =
+ service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "test", "text");
+ try {
+ query.findKeys();
+ assertFalse(expectAuthorizationError);
+ } catch (ServerOperationException e) {
+ assertTrue(e.getCause() != null && e.getCause() instanceof NotAuthorizedException);
+ assertTrue(expectAuthorizationError);
+ assertTrue(e.getLocalizedMessage().contains(expectedResponse));
+ }
}
protected LuceneCommandsSecurityDUnitTest.UserNameAndExpectedResponse[] getSearchIndexUserNameAndExpectedResponses() {
[14/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java
index 0897f90..ed06494 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURegionEntryHeap {
public VersionedStatsLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -62,10 +91,11 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +115,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,117 +126,121 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -216,7 +250,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -226,6 +260,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapLongKey.class,
"hitCount");
@@ -234,7 +269,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -243,12 +278,12 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -261,14 +296,15 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -280,7 +316,10 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -297,6 +336,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -314,6 +354,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -343,6 +384,7 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -375,12 +417,15 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -391,5 +436,8 @@ public class VersionedStatsLRURegionEntryHeapLongKey extends VersionedStatsLRURe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java
index 4e7a970..1618a91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRURegionEntryHeap {
public VersionedStatsLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -62,10 +91,11 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +115,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,117 +126,121 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -216,7 +250,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -226,6 +260,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapObjectKey.class,
"hitCount");
@@ -234,7 +269,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -243,12 +278,12 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -261,14 +296,15 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -280,7 +316,10 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -297,6 +336,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -314,6 +354,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -343,6 +384,7 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -375,13 +417,19 @@ public class VersionedStatsLRURegionEntryHeapObjectKey extends VersionedStatsLRU
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java
index 9be1689..c2f138f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java
@@ -15,41 +15,66 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLRURegionEntryHeap {
public VersionedStatsLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -68,9 +93,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -79,10 +106,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -102,7 +130,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -113,117 +141,121 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -233,7 +265,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -243,6 +275,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapStringKey1.class,
"hitCount");
@@ -251,7 +284,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -260,12 +293,12 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -278,14 +311,15 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -297,7 +331,10 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -314,6 +351,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -331,6 +369,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -360,6 +399,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -392,8 +432,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -407,7 +450,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -426,6 +469,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -455,5 +499,8 @@ public class VersionedStatsLRURegionEntryHeapStringKey1 extends VersionedStatsLR
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java
index e96217b..bd9184f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java
@@ -15,24 +15,34 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -40,16 +50,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLRURegionEntryHeap {
public VersionedStatsLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -80,9 +105,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -91,10 +118,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -114,7 +142,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -125,117 +153,121 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -245,7 +277,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -255,6 +287,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapStringKey2.class,
"hitCount");
@@ -263,7 +296,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -272,12 +305,12 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -290,14 +323,15 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -309,7 +343,10 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -326,6 +363,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -343,6 +381,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -372,6 +411,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -404,8 +444,11 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -424,7 +467,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -454,6 +497,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -496,5 +540,7 @@ public class VersionedStatsLRURegionEntryHeapStringKey2 extends VersionedStatsLR
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java
index cc6e07b..c88838b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java
@@ -15,47 +15,75 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURegionEntryHeap {
public VersionedStatsLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -64,10 +92,11 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -87,7 +116,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -98,117 +127,121 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -218,7 +251,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -228,6 +261,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapUUIDKey.class,
"hitCount");
@@ -236,7 +270,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -245,12 +279,12 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -263,14 +297,15 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -282,7 +317,10 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -299,6 +337,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -316,6 +355,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -345,6 +385,7 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -377,13 +418,16 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -396,5 +440,8 @@ public class VersionedStatsLRURegionEntryHeapUUIDKey extends VersionedStatsLRURe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java
index 07be6eb..53cb9ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java
@@ -15,49 +15,79 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -66,6 +96,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -97,13 +128,19 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -119,7 +156,9 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -143,7 +182,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -154,117 +193,121 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -274,7 +317,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -284,6 +327,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapIntKey.class,
"hitCount");
@@ -292,7 +336,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -301,12 +345,12 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -319,14 +363,15 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -338,7 +383,10 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -355,6 +403,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -372,6 +421,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -401,6 +451,7 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -433,12 +484,17 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -449,5 +505,8 @@ public class VersionedStatsLRURegionEntryOffHeapIntKey extends VersionedStatsLRU
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java
index 3e667fd..de68700 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,13 +64,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsLRURegionEntryOffHeapLongKey
extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -67,6 +97,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +129,19 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +157,9 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +183,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,117 +194,121 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -275,7 +318,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -285,6 +328,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapLongKey.class,
"hitCount");
@@ -293,7 +337,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -302,12 +346,12 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -320,14 +364,15 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -339,7 +384,10 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -356,6 +404,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -373,6 +422,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -402,6 +452,7 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -434,12 +485,15 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -450,5 +504,8 @@ public class VersionedStatsLRURegionEntryOffHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[24/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
index 2d4a4bb..a36ce1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java
@@ -15,18 +15,26 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -35,16 +43,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -75,9 +98,11 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -85,10 +110,11 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -108,7 +134,7 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -119,117 +145,121 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -239,7 +269,7 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -249,13 +279,14 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey2.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapStringKey2> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey2.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -264,12 +295,12 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -282,14 +313,15 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -301,8 +333,12 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -321,7 +357,7 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -351,6 +387,7 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -393,5 +430,7 @@ public class VMStatsLRURegionEntryHeapStringKey2 extends VMStatsLRURegionEntryHe
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
index 9a15385..e22bb15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java
@@ -15,41 +15,68 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +84,11 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +108,7 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,117 +119,121 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -211,7 +243,7 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -221,13 +253,14 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -236,12 +269,12 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -254,14 +287,15 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -273,13 +307,17 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -292,5 +330,8 @@ public class VMStatsLRURegionEntryHeapUUIDKey extends VMStatsLRURegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
index c6a7919..d01167b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -60,6 +88,7 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -90,13 +119,19 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -112,7 +147,9 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -136,7 +173,7 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -147,117 +184,121 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -267,7 +308,7 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -277,13 +318,14 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -292,12 +334,12 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -310,14 +352,15 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -329,12 +372,18 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -345,5 +394,8 @@ public class VMStatsLRURegionEntryOffHeapIntKey extends VMStatsLRURegionEntryOff
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
index 8e06b0f..51747da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -60,6 +88,7 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -90,13 +119,19 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -112,7 +147,9 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -136,7 +173,7 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -147,117 +184,121 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -267,7 +308,7 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -277,13 +318,14 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -292,12 +334,12 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -310,14 +352,15 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -329,12 +372,16 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -345,5 +392,8 @@ public class VMStatsLRURegionEntryOffHeapLongKey extends VMStatsLRURegionEntryOf
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
index d844110..1c96722 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,6 +89,7 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -91,13 +120,19 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -113,7 +148,9 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -137,7 +174,7 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -148,117 +185,121 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -268,7 +309,7 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -278,6 +319,7 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapObjectKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapObjectKey> missCountUpdater =
@@ -285,7 +327,7 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -294,12 +336,12 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -312,14 +354,15 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -331,13 +374,20 @@ public class VMStatsLRURegionEntryOffHeapObjectKey extends VMStatsLRURegionEntry
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
index 9aa6984..21d16a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java
@@ -15,40 +15,64 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -67,9 +91,11 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -78,6 +104,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -108,13 +135,19 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -130,7 +163,9 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -154,7 +189,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -165,117 +200,121 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -285,7 +324,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -295,6 +334,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -303,7 +343,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -312,12 +352,12 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -330,14 +370,15 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -349,8 +390,12 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -364,7 +409,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -383,6 +428,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -412,5 +458,8 @@ public class VMStatsLRURegionEntryOffHeapStringKey1 extends VMStatsLRURegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
index 59c4d32..54818ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java
@@ -15,40 +15,64 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -79,9 +103,11 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -90,6 +116,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -120,13 +147,19 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -142,7 +175,9 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -166,7 +201,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -177,117 +212,121 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -297,7 +336,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -307,6 +346,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -315,7 +355,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -324,12 +364,12 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -342,14 +382,15 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -361,8 +402,12 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -381,7 +426,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -411,6 +456,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -453,5 +499,7 @@ public class VMStatsLRURegionEntryOffHeapStringKey2 extends VMStatsLRURegionEntr
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[05/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
index 17b5f71..4377daa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
@@ -49,7 +49,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
*
*/
-public final class RemoveIndexesMessage extends PartitionMessage {
+public class RemoveIndexesMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/**
@@ -109,7 +109,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
* of the initialization
*/
@Override
- protected final boolean failIfRegionMissing() {
+ protected boolean failIfRegionMissing() {
return false;
}
@@ -220,7 +220,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.removeSingleIndex = in.readBoolean();
if (this.removeSingleIndex)
@@ -228,7 +228,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
}
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
super.toData(out);
out.writeBoolean(this.removeSingleIndex);
if (this.removeSingleIndex)
@@ -239,7 +239,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
* Processes remove index on the receiver.
*/
@Override
- public final void process(final DistributionManager dm) {
+ public void process(final DistributionManager dm) {
Throwable thr = null;
boolean sendReply = true;
@@ -413,7 +413,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
* index creation.
*
*/
- public static final class RemoveIndexesReplyMessage extends ReplyMessage {
+ public static class RemoveIndexesReplyMessage extends ReplyMessage {
/** Indexes removed or not. */
private boolean result;
@@ -502,7 +502,7 @@ public final class RemoveIndexesMessage extends PartitionMessage {
* @param dm distribution manager
*/
@Override
- public final void process(final DM dm, final ReplyProcessor21 p) {
+ public void process(final DM dm, final ReplyProcessor21 p) {
RemoveIndexesResponse processor = (RemoveIndexesResponse) p;
if (processor != null) {
processor.setResponse(this.result, this.numBucketsIndexesRemoved, this.numTotalBuckets);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
index 3dc5217..0c6aea8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.0
*/
-public final class SizeMessage extends PartitionMessage {
+public class SizeMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/** The list of buckets whose size is needed, if null, then all buckets */
@@ -206,7 +206,7 @@ public final class SizeMessage extends PartitionMessage {
DataSerializer.writeArrayList(this.bucketIds, out);
}
- public static final class SizeReplyMessage extends ReplyMessage {
+ public static class SizeReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private Map<Integer, SizeEntry> bucketSizes;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
index 5ae3635..281fc93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BytesAndBits.java
@@ -31,11 +31,11 @@ public class BytesAndBits {
this.userBits = userBits;
}
- public final byte[] getBytes() {
+ public byte[] getBytes() {
return this.data;
}
- public final byte getBits() {
+ public byte getBits() {
return this.userBits;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
index 2b77483..5efc7db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
@@ -91,7 +91,7 @@ public class MembershipViewRequest extends DistributionMessage implements Messag
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return this.targetReinitializing ? DistributionManager.WAITING_POOL_EXECUTOR
: DistributionManager.HIGH_PRIORITY_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
index 73b8ba9..cfb5fd4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl.java
@@ -394,7 +394,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
* Writes snapshot data to a {@link SnapshotWriter}. Caller is responsible for invoking
* {@link SnapshotWriter#snapshotComplete()}.
*/
- static final class SnapshotWriterSink implements ExportSink {
+ static class SnapshotWriterSink implements ExportSink {
private final SnapshotWriter writer;
private long bytes;
@@ -419,7 +419,7 @@ public class RegionSnapshotServiceImpl<K, V> implements RegionSnapshotService<K,
* Forwards snapshot data to a {@link ResultSender}. Caller is responsible for invoking
* {@link ResultSender#lastResult(Object)}.
*/
- static final class ResultSenderSink implements ExportSink {
+ static class ResultSenderSink implements ExportSink {
/** the fowarding destination */
private final ResultSender<SnapshotRecord[]> sender;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
index 7b291da..504081d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
@@ -58,7 +58,7 @@ import org.apache.geode.management.membership.ClientMembershipListener;
*
* @since GemFire 4.2.1
*/
-public final class InternalClientMembership {
+public class InternalClientMembership {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
index 58ba4b3..9ed00be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java
@@ -147,7 +147,7 @@ public abstract class BaseCommand implements Command {
protected SecurityService securityService = IntegratedSecurityService.getSecurityService();
- final public void execute(Message msg, ServerConnection servConn) {
+ public void execute(Message msg, ServerConnection servConn) {
// Read the request and update the statistics
long start = DistributionStats.getStatTime();
// servConn.resetTransientData();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
index 8471252..e866c79 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifierStats.java
@@ -199,23 +199,23 @@ public class CacheClientNotifierStats {
}
}
- public final void incClientRegisterRequests() {
+ public void incClientRegisterRequests() {
this._stats.incInt(_clientHealthMonitorRegisterId, 1);
}
- public final int getClientRegisterRequests() {
+ public int getClientRegisterRequests() {
return this._stats.getInt(_clientHealthMonitorRegisterId);
}
- public final int get_durableReconnectionCount() {
+ public int get_durableReconnectionCount() {
return this._stats.getInt(_durableReconnectionCount);
}
- public final int get_queueDroppedCount() {
+ public int get_queueDroppedCount() {
return this._stats.getInt(_queueDroppedCount);
}
- public final int get_eventEnqueuedWhileClientAwayCount() {
+ public int get_eventEnqueuedWhileClientAwayCount() {
return this._stats.getInt(_eventEnqueuedWhileClientAwayCount);
}
@@ -231,31 +231,31 @@ public class CacheClientNotifierStats {
return this._stats.getLong(_compiledQueryUsedCount);
}
- public final void incDurableReconnectionCount() {
+ public void incDurableReconnectionCount() {
this._stats.incInt(_durableReconnectionCount, 1);
}
- public final void incQueueDroppedCount() {
+ public void incQueueDroppedCount() {
this._stats.incInt(_queueDroppedCount, 1);
}
- public final void incEventEnqueuedWhileClientAwayCount() {
+ public void incEventEnqueuedWhileClientAwayCount() {
this._stats.incInt(_eventEnqueuedWhileClientAwayCount, 1);
}
- public final void incClientUnRegisterRequests() {
+ public void incClientUnRegisterRequests() {
this._stats.incInt(_clientHealthMonitorUnRegisterId, 1);
}
- public final void incCompiledQueryCount(long count) {
+ public void incCompiledQueryCount(long count) {
this._stats.incLong(_compiledQueryCount, count);
}
- public final void incCompiledQueryUsedCount(long count) {
+ public void incCompiledQueryUsedCount(long count) {
this._stats.incLong(_compiledQueryUsedCount, count);
}
- public final int getClientUnRegisterRequests() {
+ public int getClientUnRegisterRequests() {
return this._stats.getInt(_clientHealthMonitorUnRegisterId);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
index 8676ea8..f3663c3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
@@ -367,11 +367,11 @@ public class CacheClientProxyStats implements MessageStats {
this._stats.incInt(_deltaFullMessagesSentId, 1);
}
- public final void incReceivedBytes(long v) {
+ public void incReceivedBytes(long v) {
// noop since we never receive
}
- public final void incSentBytes(long v) {
+ public void incSentBytes(long v) {
this._stats.incLong(_sentBytesId, v);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index ef3b594..4b6d581 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
*
* @since GemFire 5.0
*/
-public final class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
+public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
private static final long serialVersionUID = 2949326125521840437L;
/**
* Serialized 2D array of the instantiators
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 4e29262..5aedcef 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -31,7 +31,7 @@ import java.io.*;
*
* @since GemFire 5.5
*/
-public final class ClientMarkerMessageImpl implements ClientMessage {
+public class ClientMarkerMessageImpl implements ClientMessage {
private static final long serialVersionUID = 5423895238521508743L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
index 324fcb8..a98214c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.cache.tier.MessageType;
*
* @since GemFire 6.6.2.x
*/
-public final class ClientPingMessageImpl implements ClientMessage {
+public class ClientPingMessageImpl implements ClientMessage {
private static final long serialVersionUID = 5423895238521508743L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 6e119c0..0b11bf1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -321,7 +321,7 @@ public class HandShake implements ClientHandShake {
}
}
- public final Version getClientVersion() {
+ public Version getClientVersion() {
return this.clientVersion;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index 8acb558..bfc3937 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -28,7 +28,7 @@ import java.io.*;
*
* @since GemFire 5.7
*/
-public final class InterestResultPolicyImpl extends InterestResultPolicy
+public class InterestResultPolicyImpl extends InterestResultPolicy
implements DataSerializableFixedID {
private static final long serialVersionUID = -7456596794818237831L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
index cf144e5..f102b2d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
@@ -660,7 +660,7 @@ public class Message {
/**
* Read the actual bytes of the header off the socket
*/
- protected final void fetchHeader() throws IOException {
+ protected void fetchHeader() throws IOException {
final ByteBuffer cb = getCommBuffer();
cb.clear();
// msgType is invalidated here and can be used as an indicator
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
index f5ca389..889980f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
@@ -325,7 +325,7 @@ public class Part {
* Write the contents of this part to the specified byte buffer. Precondition: caller has already
* checked the length of this part and it will fit into "buf".
*/
- public final void writeTo(ByteBuffer buf) {
+ public void writeTo(ByteBuffer buf) {
if (getLength() > 0) {
if (this.part instanceof byte[]) {
buf.put((byte[]) this.part);
@@ -356,7 +356,7 @@ public class Part {
* buffer. This is only called for parts that will not fit into the commBuffer so they need to be
* written directly to the socket. Precondition: buf contains nothing that needs to be sent
*/
- public final void writeTo(SocketChannel sc, ByteBuffer buf) throws IOException {
+ public void writeTo(SocketChannel sc, ByteBuffer buf) throws IOException {
if (getLength() > 0) {
final int BUF_MAX = buf.capacity();
if (this.part instanceof byte[]) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 6eadee3..83d0e9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -669,7 +669,7 @@ public class ServerConnection implements Runnable {
}
}
- static final class Counter {
+ static class Counter {
int cnt;
void incr() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
index ffe2c2c..7453ca8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest.java
@@ -29,7 +29,7 @@ public class UnregisterAllInterest implements Serializable {
/**
* Return the only instance of this class.
*/
- public static final UnregisterAllInterest singleton() {
+ public static UnregisterAllInterest singleton() {
return SINGLETON;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
index 1ef4414..9393c1e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserverHolder.java
@@ -37,7 +37,7 @@ public class VMotionObserverHolder {
/**
* Set the given observer to be notified of events. Returns the current observer.
*/
- public static final VMotionObserver setInstance(VMotionObserver observer) {
+ public static VMotionObserver setInstance(VMotionObserver observer) {
Support.assertArg(observer != null, "setInstance expects a non-null argument!");
VMotionObserver oldObserver = _instance;
_instance = observer;
@@ -45,7 +45,7 @@ public class VMotionObserverHolder {
}
/** Return the current VMotionObserver instance */
- public static final VMotionObserver getInstance() {
+ public static VMotionObserver getInstance() {
return _instance;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index fd128c3..0ba40b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -701,7 +701,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return null;
}
- final public Set<RegionQueue> getQueuesForConcurrentSerialGatewaySender() {
+ public Set<RegionQueue> getQueuesForConcurrentSerialGatewaySender() {
if (this.eventProcessor != null
&& (this.eventProcessor instanceof ConcurrentSerialGatewaySenderEventProcessor)) {
return ((ConcurrentSerialGatewaySenderEventProcessor) this.eventProcessor).getQueues();
@@ -709,7 +709,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return null;
}
- final protected void waitForRunningStatus() {
+ protected void waitForRunningStatus() {
synchronized (this.eventProcessor.runningStateLock) {
while (this.eventProcessor.getException() == null && this.eventProcessor.isStopped()) {
try {
@@ -728,7 +728,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
}
- final public void pause() {
+ public void pause() {
if (this.eventProcessor != null) {
this.getLifeCycleLock().writeLock().lock();
try {
@@ -750,7 +750,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
}
- final public void resume() {
+ public void resume() {
if (this.eventProcessor != null) {
this.getLifeCycleLock().writeLock().lock();
try {
@@ -773,21 +773,21 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
}
- final public boolean isPaused() {
+ public boolean isPaused() {
if (this.eventProcessor != null) {
return this.eventProcessor.isPaused();
}
return false;
}
- final public boolean isRunning() {
+ public boolean isRunning() {
if (this.eventProcessor != null) {
return !this.eventProcessor.isStopped();
}
return false;
}
- final public AbstractGatewaySenderEventProcessor getEventProcessor() {
+ public AbstractGatewaySenderEventProcessor getEventProcessor() {
return this.eventProcessor;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 478a54e..702438f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -349,7 +349,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
protected static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger(
DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.FAILURE_LOG_MAX_INTERVAL", 300000);
- public final boolean skipFailureLogging(Integer batchId) {
+ public boolean skipFailureLogging(Integer batchId) {
boolean skipLogging = false;
// if map has become large then give up on new events but we don't expect
// it to become too large in practise
@@ -387,7 +387,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
* After a successful batch execution remove from failure map if present (i.e. if the event had
* failed on a previous try).
*/
- public final boolean removeEventFromFailureMap(Integer batchId) {
+ public boolean removeEventFromFailureMap(Integer batchId) {
return this.failureLogInterval.remove(batchId) != null;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 9472792..72ad77b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -488,7 +488,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
/**
* Profile information for a remote counterpart.
*/
- public static final class GatewaySenderProfile extends DistributionAdvisor.Profile {
+ public static class GatewaySenderProfile extends DistributionAdvisor.Profile {
public String Id;
public long startTime;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index 4a3f398..d944997 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -41,7 +41,7 @@ import java.util.Set;
*
* @since GemFire 7.0
*/
-public final class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
+public class GatewaySenderEventCallbackArgument extends WrappedCallbackArgument
implements DataSerializableFixedID {
/**
* The id of the originating <code>GatewayReceiver</code> making the request
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 2c3cb67..39f30d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1752,31 +1752,31 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
// Prevent this region from participating in a TX, bug 38709
@Override
- final public boolean isSecret() {
+ public boolean isSecret() {
return true;
}
// Prevent this region from using concurrency checks
@Override
- final public boolean supportsConcurrencyChecks() {
+ public boolean supportsConcurrencyChecks() {
return false;
}
@Override
- final protected boolean shouldNotifyBridgeClients() {
+ protected boolean shouldNotifyBridgeClients() {
return false;
}
@Override
- final public boolean generateEventID() {
+ public boolean generateEventID() {
return false;
}
- final public boolean isUsedForParallelGatewaySenderQueue() {
+ public boolean isUsedForParallelGatewaySenderQueue() {
return true;
}
- final public AbstractGatewaySender getParallelGatewaySender() {
+ public AbstractGatewaySender getParallelGatewaySender() {
return this.sender;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
index 47005c3..cd0ba30 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
@@ -154,7 +154,7 @@ public class ParallelQueueBatchRemovalMessage extends PartitionMessage {
this.bucketToTailKey = (Map) DataSerializer.readObject(in);
}
- public static final class BatchRemovalReplyMessage extends ReplyMessage {
+ public static class BatchRemovalReplyMessage extends ReplyMessage {
/**
* Empty constructor to conform to DataSerializable interface
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 7928662..6fa17a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -1171,7 +1171,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
// Prevent this region from using concurrency checks
@Override
- final public boolean supportsConcurrencyChecks() {
+ public boolean supportsConcurrencyChecks() {
return false;
}
@@ -1182,7 +1182,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
// Prevent this region from participating in a TX, bug 38709
@Override
- final public boolean isSecret() {
+ public boolean isSecret() {
return true;
}
@@ -1191,22 +1191,22 @@ public class SerialGatewaySenderQueue implements RegionQueue {
public void createEventTracker() {}
@Override
- final protected boolean shouldNotifyBridgeClients() {
+ protected boolean shouldNotifyBridgeClients() {
return false;
}
@Override
- final public boolean generateEventID() {
+ public boolean generateEventID() {
return false;
}
@Override
- final public boolean isUsedForSerialGatewaySenderQueue() {
+ public boolean isUsedForSerialGatewaySenderQueue() {
return true;
}
@Override
- final public AbstractGatewaySender getSerialGatewaySender() {
+ public AbstractGatewaySender getSerialGatewaySender() {
return sender;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index 9816f26..bcf78a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -905,7 +905,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return String value for named attribute or null if attribute not defined.
* @since GemFire 8.1
*/
- public static final String getString(final Attributes attributes, final String name) {
+ public static String getString(final Attributes attributes, final String name) {
return getString(attributes, name, null);
}
@@ -917,7 +917,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return String value for named attribute or <code>defaultValue</code> if attribute not defined.
* @since GemFire 8.1
*/
- public static final String getString(final Attributes attributes, final String name,
+ public static String getString(final Attributes attributes, final String name,
final String defaultValue) {
final String value = attributes.getValue(name);
if (null == value) {
@@ -933,7 +933,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return Integer value for named attribute or null if attribute not defined.
* @since GemFire 8.1
*/
- public static final Integer getInteger(final Attributes attributes, final String name) {
+ public static Integer getInteger(final Attributes attributes, final String name) {
return getInteger(attributes, name, null);
}
@@ -946,7 +946,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* defined.
* @since GemFire 8.1
*/
- public static final Integer getInteger(final Attributes attributes, final String name,
+ public static Integer getInteger(final Attributes attributes, final String name,
final Integer defaultValue) {
final String value = attributes.getValue(name);
if (null == value) {
@@ -962,7 +962,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return Boolean value for named attribute or null if attribute not defined.
* @since GemFire 8.1
*/
- public static final Boolean getBoolean(final Attributes attributes, final String name) {
+ public static Boolean getBoolean(final Attributes attributes, final String name) {
return getBoolean(attributes, name, null);
}
@@ -975,7 +975,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* defined.
* @since GemFire 8.1
*/
- public static final Boolean getBoolean(final Attributes attributes, final String name,
+ public static Boolean getBoolean(final Attributes attributes, final String name,
final Boolean defaultValue) {
final String value = attributes.getValue(name);
if (null == value) {
@@ -992,7 +992,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return Enum value for named attribute or null if attribute not defined.
* @since GemFire 8.1
*/
- public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
+ public static <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
final Class<E> clazz) {
return getEnum(attributes, name, clazz, null);
}
@@ -1006,7 +1006,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
* @return Enum value for named attribute or <code>defaultValue</code> if attribute not defined.
* @since GemFire 8.1
*/
- public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
+ public static <E extends Enum<E>> E getEnum(final Attributes attributes, final String name,
final Class<E> clazz, E defaultValue) {
String value = attributes.getValue(name);
if (null == value) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
index 194b2ec..cdd9659 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -32,7 +32,7 @@ import org.xml.sax.ext.EntityResolver2;
*
* @since GemFire 8.1
*/
-public final class GeodeEntityResolver extends DefaultEntityResolver2 {
+public class GeodeEntityResolver extends DefaultEntityResolver2 {
private static final String SYSTEM_ID_ROOT = "http://geode.apache.org/";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
index 48ac881..68e43dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolver.java
@@ -32,7 +32,7 @@ import org.xml.sax.ext.EntityResolver2;
*
* @since GemFire 8.1
*/
-public final class PivotalEntityResolver extends DefaultEntityResolver2 {
+public class PivotalEntityResolver extends DefaultEntityResolver2 {
private static final String SYSTEM_ID_ROOT = "http://schema.pivotal.io/";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
index 3959316..5a4a052 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtils.java
@@ -29,7 +29,7 @@ import org.xml.sax.helpers.AttributesImpl;
* @since GemFire 8.1
*/
// UnitTest XmlGeneratorUtilsTest
-public final class XmlGeneratorUtils {
+public class XmlGeneratorUtils {
private XmlGeneratorUtils() {
// statics only
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
index f2d21fd..89ad5ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AtomicLong5.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.concurrent;
/**
* AL implementation for JDK 5.
*/
-public final class AtomicLong5 extends java.util.concurrent.atomic.AtomicLong implements AL {
+public class AtomicLong5 extends java.util.concurrent.atomic.AtomicLong implements AL {
private static final long serialVersionUID = -1915700199064062938L;
public AtomicLong5() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
index 1bc4add..9c40f0a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
@@ -338,19 +338,19 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
this.next = next;
}
- public final K getKey() {
+ public K getKey() {
return key;
}
- public final int hashCode() {
+ public int hashCode() {
return key.hashCode();
}
- public final String toString() {
+ public String toString() {
return key.toString();
}
- public final boolean equals(Object o) {
+ public boolean equals(Object o) {
Object k, u;
Node<?> e;
return ((o instanceof Node) && ((k = (e = (Node<?>) o)) != null)
@@ -387,14 +387,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* the highest bits that would otherwise never be used in index calculations because of table
* bounds.
*/
- static final int spread(int h) {
+ static int spread(int h) {
return (h ^ (h >>> 16)) & HASH_BITS;
}
/**
* Returns a power of two table size for the given desired capacity. See Hackers Delight, sec 3.2
*/
- private static final int tableSizeFor(int c) {
+ private static int tableSizeFor(int c) {
int n = c - 1;
n |= n >>> 1;
n |= n >>> 2;
@@ -451,15 +451,15 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
*/
@SuppressWarnings("unchecked")
- static final <K> Node<K> tabAt(Node<K>[] tab, int i) {
+ static <K> Node<K> tabAt(Node<K>[] tab, int i) {
return (Node<K>) U.getObjectVolatile(tab, ((long) i << ASHIFT) + ABASE);
}
- static final <K> boolean casTabAt(Node<K>[] tab, int i, Node<K> c, Node<K> v) {
+ static <K> boolean casTabAt(Node<K>[] tab, int i, Node<K> c, Node<K> v) {
return U.compareAndSwapObject(tab, ((long) i << ASHIFT) + ABASE, c, v);
}
- static final <K> void setTabAt(Node<K>[] tab, int i, Node<K> v) {
+ static <K> void setTabAt(Node<K>[] tab, int i, Node<K> v) {
U.putOrderedObject(tab, ((long) i << ASHIFT) + ABASE, v);
}
@@ -624,7 +624,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
}
/** Implementation for add */
- final boolean putKey(V key, boolean onlyIfAbsent) {
+ boolean putKey(V key, boolean onlyIfAbsent) {
if (key == null)
throw new NullPointerException();
int hash = spread(key.hashCode());
@@ -698,7 +698,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
return removeNode(key);
}
- final boolean removeNode(Object key) {
+ boolean removeNode(Object key) {
int hash = spread(key.hashCode());
for (Node<V>[] tab = table;;) {
Node<V> f;
@@ -1030,7 +1030,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* A node inserted at head of bins during transfer operations.
*/
- static final class ForwardingNode<K> extends Node<K> {
+ static class ForwardingNode<K> extends Node<K> {
final Node<K>[] nextTable;
ForwardingNode(Node<K>[] tab) {
@@ -1060,7 +1060,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* A place-holder node used in computeIfAbsent and compute
*/
- static final class ReservationNode<K> extends Node<K> {
+ static class ReservationNode<K> extends Node<K> {
ReservationNode() {
super(RESERVED, null, null);
}
@@ -1076,14 +1076,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* Returns the stamp bits for resizing a table of size n. Must be negative when shifted left by
* RESIZE_STAMP_SHIFT.
*/
- static final int resizeStamp(int n) {
+ static int resizeStamp(int n) {
return Integer.numberOfLeadingZeros(n) | (1 << (RESIZE_STAMP_BITS - 1));
}
/**
* Initializes table, using the size recorded in sizeCtl.
*/
- private final Node<V>[] initTable() {
+ private Node<V>[] initTable() {
Node<V>[] tab;
int sc;
while ((tab = table) == null || tab.length == 0) {
@@ -1115,7 +1115,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* @param x the count to add
* @param check if <0, don't check resize, if <= 1 only check if uncontended
*/
- private final void addCount(long x, int check) {
+ private void addCount(long x, int check) {
CounterCell[] as;
long b, s;
if ((as = counterCells) != null
@@ -1157,7 +1157,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Helps transfer if a resize is in progress.
*/
- final Node<V>[] helpTransfer(Node<V>[] tab, Node<V> f) {
+ Node<V>[] helpTransfer(Node<V>[] tab, Node<V> f) {
Node<V>[] nextTab;
int sc;
if (tab != null && (f instanceof ForwardingNode)
@@ -1182,7 +1182,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
*
* @param size number of elements (doesn't need to be perfectly accurate)
*/
- private final void tryPresize(int size) {
+ private void tryPresize(int size) {
int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY
: tableSizeFor(size + (size >>> 1) + 1);
int sc;
@@ -1223,7 +1223,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Moves and/or copies the nodes in each bin to new table. See above for explanation.
*/
- private final void transfer(Node<V>[] tab, Node<V>[] nextTab) {
+ private void transfer(Node<V>[] tab, Node<V>[] nextTab) {
int n = tab.length, stride;
if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
stride = MIN_TRANSFER_STRIDE; // subdivide range
@@ -1354,7 +1354,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* Replaces all linked nodes in bin at given index unless table is too small, in which case
* resizes instead.
*/
- private final void treeifyBin(Node<V>[] tab, int index) {
+ private void treeifyBin(Node<V>[] tab, int index) {
Node<V> b;
int n, sc;
if (tab != null) {
@@ -1400,7 +1400,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Nodes for use in TreeBins
*/
- static final class TreeNode<K> extends Node<K> {
+ static class TreeNode<K> extends Node<K> {
TreeNode<K> parent; // red-black tree links
TreeNode<K> left;
TreeNode<K> right;
@@ -1419,7 +1419,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Returns the TreeNode (or null if not found) for the given key starting at given root.
*/
- final TreeNode<K> findTreeNode(int h, Object k, Class<?> kc) {
+ TreeNode<K> findTreeNode(int h, Object k, Class<?> kc) {
if (k != null) {
TreeNode<K> p = this;
do {
@@ -1459,7 +1459,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* forcing writers (who hold bin lock) to wait for readers (who do not) to complete before tree
* restructuring operations.
*/
- static final class TreeBin<K> extends Node<K> {
+ static class TreeBin<K> extends Node<K> {
TreeNode<K> root;
volatile TreeNode<K> first;
volatile Thread waiter;
@@ -1530,7 +1530,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Acquires write lock for tree restructuring.
*/
- private final void lockRoot() {
+ private void lockRoot() {
if (!U.compareAndSwapInt(this, LOCKSTATE, 0, WRITER))
contendedLock(); // offload to separate method
}
@@ -1538,14 +1538,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Releases write lock for tree restructuring.
*/
- private final void unlockRoot() {
+ private void unlockRoot() {
lockState = 0;
}
/**
* Possibly blocks awaiting root lock.
*/
- private final void contendedLock() {
+ private void contendedLock() {
boolean waiting = false;
for (int s;;) {
if (((s = lockState) & ~WAITER) == 0) {
@@ -1568,7 +1568,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* Returns matching node or null if none. Tries to search using tree comparisons from root, but
* continues linear search when lock not available.
*/
- final Node<K> find(int h, Object k) {
+ Node<K> find(int h, Object k) {
if (k != null) {
for (Node<K> e = first; e != null;) {
int s;
@@ -1607,7 +1607,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
*
* @return null if added
*/
- final TreeNode<K> putTreeVal(int h, K k) {
+ TreeNode<K> putTreeVal(int h, K k) {
Class<?> kc = null;
boolean searched = false;
for (TreeNode<K> p = root;;) {
@@ -1669,7 +1669,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
*
* @return true if now too small, so should be untreeified
*/
- final boolean removeTreeNode(TreeNode<K> p) {
+ boolean removeTreeNode(TreeNode<K> p) {
TreeNode<K> next = (TreeNode<K>) p.next;
TreeNode<K> pred = p.prev; // unlink traversal pointers
TreeNode<K> r, rl;
@@ -1979,7 +1979,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* Records the table, its length, and current traversal index for a traverser that must process a
* region of a forwarded table before proceeding with current table.
*/
- static final class TableStack<K> {
+ static class TableStack<K> {
int length;
int index;
Node<K>[] tab;
@@ -2022,7 +2022,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Advances if possible, returning next valid node, or null if none.
*/
- final Node<K> advance() {
+ Node<K> advance() {
Node<K> e;
if ((e = next) != null)
e = e.next;
@@ -2103,15 +2103,15 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
advance();
}
- public final boolean hasNext() {
+ public boolean hasNext() {
return next != null;
}
- public final boolean hasMoreElements() {
+ public boolean hasMoreElements() {
return next != null;
}
- public final void remove() {
+ public void remove() {
Node<K> p;
if ((p = lastReturned) == null)
throw new IllegalStateException();
@@ -2120,12 +2120,12 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
}
}
- static final class KeyIterator<K> extends BaseIterator<K> implements Iterator<K>, Enumeration<K> {
+ static class KeyIterator<K> extends BaseIterator<K> implements Iterator<K>, Enumeration<K> {
KeyIterator(Node<K>[] tab, int index, int size, int limit, CompactConcurrentHashSet2<K> map) {
super(tab, index, size, limit, map);
}
- public final K next() {
+ public K next() {
Node<K> p;
if ((p = next) == null)
throw new NoSuchElementException();
@@ -2135,7 +2135,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
return k;
}
- public final K nextElement() {
+ public K nextElement() {
return next();
}
}
@@ -2147,7 +2147,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
// See their internal docs for explanation.
// A padded cell for distributing counts
- static final class CounterCell {
+ static class CounterCell {
volatile long p0, p1, p2, p3, p4, p5, p6;
volatile long value;
volatile long q0, q1, q2, q3, q4, q5, q6;
@@ -2161,7 +2161,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
* Holder for the thread-local hash code determining which CounterCell to use. The code is
* initialized via the counterHashCodeGenerator, but may be moved upon collisions.
*/
- static final class CounterHashCode {
+ static class CounterHashCode {
int code;
}
@@ -2181,7 +2181,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
static final ThreadLocal<CounterHashCode> threadCounterHashCode =
new ThreadLocal<CounterHashCode>();
- final long sumCount() {
+ long sumCount() {
CounterCell[] as = counterCells;
CounterCell a;
long sum = baseCount;
@@ -2195,7 +2195,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
}
// See LongAdder version for explanation
- private final void fullAddCount(long x, CounterHashCode hc, boolean wasUncontended) {
+ private void fullAddCount(long x, CounterHashCode hc, boolean wasUncontended) {
int h;
if (hc == null) {
hc = new CounterHashCode();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
index 7f53a23..4fa45e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/DateFormatter.java
@@ -22,7 +22,7 @@ import java.util.Date;
* Defines the common date format for GemFire and provides DateFormat instances.
*
*/
-public final class DateFormatter {
+public class DateFormatter {
/**
* The format string used to format the timestamp of GemFire log messages
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java b/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
index 324f464..bef89be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireHandler.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterLogger;
* Implementation of the standard JDK handler that publishes a log record to a LogWriterImpl. Note
* this handler ignores any installed handler.
*/
-public final class GemFireHandler extends Handler {
+public class GemFireHandler extends Handler {
/**
* Use the log writer to use some of its formatting code.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
index dbb6573..dadf79a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/PureLogWriter.java
@@ -252,7 +252,7 @@ public class PureLogWriter extends LogWriterImpl {
}
}
- public final void close() {
+ public void close() {
this.closed = true;
try {
if (this.logWriter != null) {
@@ -263,7 +263,7 @@ public class PureLogWriter extends LogWriterImpl {
}
}
- public final boolean isClosed() {
+ public boolean isClosed() {
return this.closed;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
index c95a375..d791835 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityLogWriter.java
@@ -28,7 +28,7 @@ import org.apache.geode.i18n.StringId;
*
* @since GemFire 5.5
*/
-public final class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
+public class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
public static final String SECURITY_PREFIX = DistributionConfig.SECURITY_PREFIX_NAME;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
index 3e62f7d..d0c6eaa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/SecurityManagerLogWriter.java
@@ -29,7 +29,7 @@ import java.io.PrintStream;
*
* @since GemFire 5.5
*/
-public final class SecurityManagerLogWriter extends ManagerLogWriter {
+public class SecurityManagerLogWriter extends ManagerLogWriter {
public SecurityManagerLogWriter(int level, PrintStream stream) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
index 8a50050..a7151cc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertAppender.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.tcp.ReenteredConnectException;
* to the log file.
*
*/
-public final class AlertAppender extends AbstractAppender implements PropertyChangeListener {
+public class AlertAppender extends AbstractAppender implements PropertyChangeListener {
private static final String APPENDER_NAME = AlertAppender.class.getName();
private static final Logger logger = LogService.getLogger();
private static final AlertAppender instance = createAlertAppender();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
index 3364759..717ae05 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LocalizedMessage.java
@@ -23,7 +23,7 @@ import org.apache.geode.i18n.StringId;
* An implementation of a Log4j {@link Message} that wraps a {@link StringId}.
*
*/
-public final class LocalizedMessage implements Message {
+public class LocalizedMessage implements Message {
private static final long serialVersionUID = -8893339995741536401L;
private final StringId stringId;
@@ -41,19 +41,19 @@ public final class LocalizedMessage implements Message {
return new LocalizedMessage(stringId, null, null);
}
- public static final LocalizedMessage create(final StringId stringId, final Object[] params) {
+ public static LocalizedMessage create(final StringId stringId, final Object[] params) {
return new LocalizedMessage(stringId, params, null);
}
- public static final LocalizedMessage create(final StringId stringId, final Throwable throwable) {
+ public static LocalizedMessage create(final StringId stringId, final Throwable throwable) {
return new LocalizedMessage(stringId, null, throwable);
}
- public static final LocalizedMessage create(final StringId stringId, final Object object) {
+ public static LocalizedMessage create(final StringId stringId, final Object object) {
return new LocalizedMessage(stringId, new Object[] {object}, null);
}
- public static final LocalizedMessage create(final StringId stringId, final Object[] params,
+ public static LocalizedMessage create(final StringId stringId, final Object[] params,
final Throwable throwable) {
return new LocalizedMessage(stringId, params, throwable);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
index 61cbd45..8559d47 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppender.java
@@ -70,7 +70,7 @@ public class LogWriterAppender extends AbstractAppender implements PropertyChang
*
* @return The new instance.
*/
- static final LogWriterAppender create(final AppenderContext[] contexts, final String name,
+ static LogWriterAppender create(final AppenderContext[] contexts, final String name,
final PureLogWriter logWriter, final FileOutputStream fos) {
LogWriterAppender appender = new LogWriterAppender(contexts, name, logWriter, fos);
for (AppenderContext context : appender.appenderContexts) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
index 2a248cc..fad126b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLogger.java
@@ -38,7 +38,7 @@ import java.util.logging.Handler;
*
*/
@SuppressWarnings("unused")
-public final class LogWriterLogger extends FastLogger implements InternalLogWriter, GemFireLogger {
+public class LogWriterLogger extends FastLogger implements InternalLogWriter, GemFireLogger {
private static final long serialVersionUID = 446081244292135L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
index 730fc04..338b1d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/ThreadIdPatternConverter.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
*/
@Plugin(name = "ThreadIdPatternConverter", category = "Converter")
@ConverterKeys({"tid", "threadId"})
-public final class ThreadIdPatternConverter extends LogEventPatternConverter {
+public class ThreadIdPatternConverter extends LogEventPatternConverter {
/**
* Singleton.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
index 09f2899..f0d40f2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/message/GemFireParameterizedMessageFactory.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
* Geode changes include changing class name and package. Additional changes are commented with "//
* GEODE: note"
*/
-public final class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
+public class GemFireParameterizedMessageFactory extends AbstractMessageFactory {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 82e36ab..fec81ca 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -607,7 +607,7 @@ public class SocketCreator {
return extendedKeyManagers;
}
- private static final class ExtendedAliasKeyManager extends X509ExtendedKeyManager {
+ private static class ExtendedAliasKeyManager extends X509ExtendedKeyManager {
private final X509ExtendedKeyManager delegate;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
index 3c9dd72..cd4814b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/DataType.java
@@ -39,7 +39,7 @@ import org.apache.geode.pdx.internal.PdxType;
*/
public class DataType implements DSCODE {
- public static final String getDataType(byte[] bytes) {
+ public static String getDataType(byte[] bytes) {
final DataInput in = getDataInput(bytes);
byte header = 0;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
index 670f789..ad9fa09 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
@@ -883,7 +883,7 @@ public class FreeListManager {
/**
* Used to represent an address from a tiny free list as a MemoryBlock
*/
- protected static final class TinyMemoryBlock implements MemoryBlock {
+ protected static class TinyMemoryBlock implements MemoryBlock {
private final long address;
private final int freeListId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
index b3e9ba6..2103785 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/AttachProcessUtils.java
@@ -23,7 +23,7 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
*
* @since GemFire 8.0
*/
-final class AttachProcessUtils implements InternalProcessUtils {
+class AttachProcessUtils implements InternalProcessUtils {
AttachProcessUtils() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
index 7a47b1e..9d2b497 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/BlockingProcessStreamReader.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 8.2
*/
-public final class BlockingProcessStreamReader extends ProcessStreamReader {
+public class BlockingProcessStreamReader extends ProcessStreamReader {
private static final Logger logger = LogService.getLogger();
protected BlockingProcessStreamReader(final Builder builder) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
index bb4fba2..7699cc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ClusterConfigurationNotAvailableException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 8.0
*/
-public final class ClusterConfigurationNotAvailableException extends RuntimeException {
+public class ClusterConfigurationNotAvailableException extends RuntimeException {
private static final long serialVersionUID = -3448160213553925462L;
public ClusterConfigurationNotAvailableException(String message) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
index 7765ef3..0c04130 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ConnectionFailedException.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 7.0
*/
-public final class ConnectionFailedException extends Exception {
+public class ConnectionFailedException extends Exception {
private static final long serialVersionUID = 5622636452836752700L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
index beae4b4..0af8758 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControlFileWatchdog.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 8.0
*/
-final class ControlFileWatchdog implements Runnable {
+class ControlFileWatchdog implements Runnable {
private static final Logger logger = LogService.getLogger();
private static final long STOP_TIMEOUT_MILLIS = 60 * 1000;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
index 288a4f3..7641ed3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.process.ControlFileWatchdog.ControlRequestHandl
*
* @since GemFire 8.0
*/
-public final class ControllableProcess {
+public class ControllableProcess {
private static final Logger logger = LogService.getLogger();
private final File workingDir;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
index 1bddfeb..4bb6d57 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileAlreadyExistsException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 7.0
*/
-public final class FileAlreadyExistsException extends Exception {
+public class FileAlreadyExistsException extends Exception {
private static final long serialVersionUID = 5471082555536094256L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
index efca868..fbea19e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessController.java
@@ -47,7 +47,7 @@ import com.sun.tools.attach.VirtualMachine;
* @since GemFire 7.0
* @deprecated as of 8.0 please use {@link ControllableProcess} instead
*/
-public final class LocalProcessController {
+public class LocalProcessController {
/** Property name for the JMX local connector address (from sun.management.Agent) */
private static final String LOCAL_CONNECTOR_ADDRESS_PROP =
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
index 37184fc..04809c2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/LocalProcessLauncher.java
@@ -34,7 +34,7 @@ import java.io.IOException;
*
* @since GemFire 7.0
*/
-public final class LocalProcessLauncher {
+public class LocalProcessLauncher {
public static final String PROPERTY_IGNORE_IS_PID_ALIVE =
DistributionConfig.GEMFIRE_PREFIX + "test.LocalProcessLauncher.ignoreIsPidAlive";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
index f1e499e..724a4d7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanInvocationFailedException.java
@@ -19,7 +19,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 7.0
*/
-public final class MBeanInvocationFailedException extends Exception {
+public class MBeanInvocationFailedException extends Exception {
private static final long serialVersionUID = 7991096466859690801L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
index 0b7cfd6..ea5946e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/MBeanProcessController.java
@@ -42,7 +42,7 @@ import com.sun.tools.attach.VirtualMachine;
*
* @since GemFire 8.0
*/
-public final class MBeanProcessController implements ProcessController {
+public class MBeanProcessController implements ProcessController {
/** Property name for the JMX local connector address (from sun.management.Agent) */
private static final String LOCAL_CONNECTOR_ADDRESS_PROP =
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
index 685f39e..34cf81f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NativeProcessUtils.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.shared.NativeCalls;
*
* @since GemFire 8.0
*/
-final class NativeProcessUtils implements InternalProcessUtils {
+class NativeProcessUtils implements InternalProcessUtils {
private final static NativeCalls nativeCalls = NativeCalls.getInstance();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
index 202790f..d5c1116 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/NonBlockingProcessStreamReader.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.util.StopWatch;
*
* @since GemFire 8.2
*/
-public final class NonBlockingProcessStreamReader extends ProcessStreamReader {
+public class NonBlockingProcessStreamReader extends ProcessStreamReader {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
index d45ce59..6fa1c9f 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/PidUnavailableException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 7.0
*/
-public final class PidUnavailableException extends Exception {
+public class PidUnavailableException extends Exception {
private static final long serialVersionUID = -1660269538268828059L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
index 9c5c722..38fdcf8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessControllerFactory.java
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeoutException;
*
* @since GemFire 8.0
*/
-public final class ProcessControllerFactory {
+public class ProcessControllerFactory {
public static final String PROPERTY_DISABLE_ATTACH_API =
DistributionConfig.GEMFIRE_PREFIX + "test.ProcessControllerFactory.DisableAttachApi";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
index 11a4709..463fd18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessLauncherContext.java
@@ -28,7 +28,7 @@ import java.util.Properties;
*
* @since GemFire 7.0
*/
-public final class ProcessLauncherContext {
+public class ProcessLauncherContext {
public static final String OVERRIDDEN_DEFAULTS_PREFIX =
DistributionConfig.GEMFIRE_PREFIX + "default.";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
index 53c01f6..510353c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessTerminatedAbnormallyException.java
@@ -26,7 +26,7 @@ import org.apache.geode.GemFireException;
* @see org.apache.geode.GemFireException
* @since GemFire 7.0
*/
-public final class ProcessTerminatedAbnormallyException extends GemFireException {
+public class ProcessTerminatedAbnormallyException extends GemFireException {
private static final long serialVersionUID = -1181367425266595492L;
private final int exitValue;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
index f15489f..3ff74d8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/ProcessUtils.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.util.IOUtils;
*
* @since GemFire 7.0
*/
-public final class ProcessUtils {
+public class ProcessUtils {
private static InternalProcessUtils internal = initializeInternalProcessUtils();
[63/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeap.java
index 6071836..3364a6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedThinRegionEntryHeap extends VersionedThinRegionEntry {
+
public VersionedThinRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedThinRegionEntryHeap extends VersionedThinRegionEn
}
private static class VersionedThinRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VersionedThinRegionEntryHeap extends VersionedThinRegionEn
return new VersionedThinRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java
index 21c1806..f225bac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedThinRegionEntryOffHeap extends VersionedThinRegionEntry
implements OffHeapRegionEntry {
+
public VersionedThinRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedThinRegionEntryOffHeap extends VersionedThinRegio
}
private static class VersionedThinRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinRegionEntryOffHeap extends VersionedThinRegio
return new VersionedThinRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
index da0c190..1f328ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
@@ -436,7 +436,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
});
}
- public final boolean isHeapCritical(final InternalDistributedMember member) {
+ public boolean isHeapCritical(final InternalDistributedMember member) {
ResourceManagerProfile rmp = (ResourceManagerProfile) getProfile(member);
return rmp != null ? rmp.getHeapState().isCritical() : false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index 0fd607c..b1e5bab 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache.locks;
import org.apache.geode.internal.DataSerializableFixedID;
@@ -25,11 +24,11 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Identifies a group of transaction locks.
- *
*/
public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
private static final long serialVersionUID = 8579214625084490134L;
+
/** DistributionManager id for this member */
private InternalDistributedMember memberId;
@@ -122,7 +121,7 @@ public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
out.writeInt(this.id);
}
- public static final TXLockIdImpl createFromData(DataInput in)
+ public static TXLockIdImpl createFromData(DataInput in)
throws IOException, ClassNotFoundException {
TXLockIdImpl result = new TXLockIdImpl();
result.fromData(in);
@@ -131,7 +130,6 @@ public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
@Override
public Version[] getSerializationVersions() {
- // TODO Auto-generated method stub
return null;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
index 9b69c7e..b07a124 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUAlgorithm.java
@@ -16,13 +16,16 @@ package org.apache.geode.internal.cache.lru;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.StatisticsFactory;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheCallback;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.PlaceHolderDiskRegion;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Properties;
/**
* Eviction controllers that extend this class evict the least recently used (LRU) entry in the
@@ -67,8 +70,6 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
*/
public static final String EVICTION_ACTION = "eviction-action";
- //////////////////////// Instance Fields ///////////////////////
-
/** What to do upon eviction */
protected EvictionAction evictionAction;
@@ -79,7 +80,6 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
private transient EnableLRU helper;
protected BucketRegion bucketRegion;
- ///////////////////////// Constructors /////////////////////////
/**
* Creates a new <code>LRUAlgorithm</code> with the given {@linkplain EvictionAction eviction
@@ -91,8 +91,6 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
this.helper = createLRUHelper();
}
- /////////////////////// Instance Methods ///////////////////////
-
/**
* Used to hook up a bucketRegion late during disk recover.
*/
@@ -131,7 +129,7 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
* For internal use only. Returns a helper object used internally by the GemFire cache
* implementation.
*/
- public final EnableLRU getLRUHelper() {
+ public EnableLRU getLRUHelper() {
synchronized (this) {
// Synchronize with readObject/writeObject to avoid race
// conditions with copy sharing. See bug 31047.
@@ -154,24 +152,6 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
}
}
- // public void writeExternal(ObjectOutput out)
- // throws IOException {
- // out.writeObject(this.evictionAction);
- // }
-
- // public void readExternal(ObjectInput in)
- // throws IOException, ClassNotFoundException {
- // String evictionAction = (String) in.readObject();
- // this.setEvictionAction(evictionAction);
- // }
-
- // protected Object readResolve() throws ObjectStreamException {
- // if (this.helper == null) {
- // this.helper = createLRUHelper();
- // }
- // return this;
- // }
-
/**
* Creates a new <code>LRUHelper</code> tailed for this LRU algorithm implementation.
*/
@@ -241,11 +221,7 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- *
+ /**
* Note that we just need to make sure that equal objects return equal hashcodes; nothing really
* elaborate is done here.
*/
@@ -262,8 +238,6 @@ public abstract class LRUAlgorithm implements CacheCallback, Serializable, Clone
@Override
public abstract String toString();
- ////////////////////// Inner Classes //////////////////////
-
/**
* A partial implementation of the <code>EnableLRU</code> interface that contains code common to
* all <code>LRUAlgorithm</code>s.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
index 8d164c8..c4a3fbd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
@@ -44,7 +44,7 @@ public class BucketBackupMessage extends PartitionMessage {
private int bucketId;
/**
- * Empty contstructor provided for {@link org.apache.geode.DataSerializer}
+ * Empty constructor provided for {@link org.apache.geode.DataSerializer}
*/
public BucketBackupMessage() {
super();
@@ -73,7 +73,7 @@ public class BucketBackupMessage extends PartitionMessage {
* of the initialization
*/
@Override
- protected final boolean failIfRegionMissing() {
+ protected boolean failIfRegionMissing() {
return false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
index f1633bd..c9d7d70 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
@@ -98,8 +98,8 @@ public class DeposePrimaryBucketMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
BucketAdvisor bucketAdvisor = region.getRegionAdvisor().getBucketAdvisor(this.bucketId);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
index 664ebe7..1072576 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache.partitioned;
import java.io.DataInput;
@@ -85,7 +84,6 @@ public class FetchEntryMessage extends PartitionMessage {
* @param recipient the member that the getEntry message is sent to
* @param r the PartitionedRegion for which getEntry was performed upon
* @param key the object to which the value should be feteched
- * @param access
* @return the processor used to fetch the returned value associated with the key
* @throws ForceReattemptException if the peer is no longer available
*/
@@ -109,11 +107,6 @@ public class FetchEntryMessage extends PartitionMessage {
fromData(in);
}
- // final public int getProcessorType()
- // {
- // return DistributionManager.PARTITIONED_REGION_EXECUTOR;
- // }
-
@Override
public boolean isSevereAlertCompatible() {
// allow forced-disconnect processing for all cache op messages
@@ -121,7 +114,7 @@ public class FetchEntryMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
long startTime) throws ForceReattemptException {
// FetchEntryMessage is used in refreshing client caches during interest list recovery,
// so don't be too verbose or hydra tasks may time out
@@ -209,7 +202,7 @@ public class FetchEntryMessage extends PartitionMessage {
return s;
}
- public final void setKey(Object key) {
+ public void setKey(Object key) {
this.key = key;
}
@@ -322,9 +315,7 @@ public class FetchEntryMessage extends PartitionMessage {
}
/**
- * A processor to capture the value returned by
- * {@link org.apache.geode.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage}
- *
+ * A processor to capture the value returned by {@link FetchEntryMessage.FetchEntryReplyMessage}
*/
public static class FetchEntryResponse extends PartitionResponse {
private volatile EntrySnapshot returnValue;
@@ -356,13 +347,10 @@ public class FetchEntryMessage extends PartitionMessage {
/**
* @return Object associated with the key that was sent in the get message
- * @throws EntryNotFoundException
* @throws ForceReattemptException if the peer is no longer available
- * @throws EntryNotFoundException
*/
public EntrySnapshot waitForResponse() throws EntryNotFoundException, ForceReattemptException {
try {
- // waitForRepliesUninterruptibly();
waitForCacheException();
} catch (ForceReattemptException e) {
e.checkKey(key);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
index 21dfa8d..523186d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
@@ -99,8 +99,8 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
PartitionMemberInfoImpl details = (PartitionMemberInfoImpl) region.getRedundancyProvider()
.buildPartitionMemberDetails(this.internal, this.loadProbe);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
index 6f18013..2d2b3c4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
@@ -47,7 +47,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* Usage: MoveBucketResponse response = MoveBucketMessage.send( InternalDistributedMember,
* PartitionedRegion, int bucketId); if (response != null && response.waitForResponse()) { // bucket
* was moved }
- *
*/
public class MoveBucketMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
@@ -106,8 +105,8 @@ public class MoveBucketMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
PartitionedRegionDataStore dataStore = region.getDataStore();
boolean moved = dataStore.moveBucket(this.bucketId, this.source, true);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
index 6b59f51..8c27107 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
@@ -184,24 +184,17 @@ public abstract class PartitionMessage extends DistributionMessage
this.isTransactionDistributed = other.isTransactionDistributed;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.internal.cache.TransactionMessage#getTXOriginatorClient()
- */
public InternalDistributedMember getTXOriginatorClient() {
return txMemberId;
}
- public final InternalDistributedMember getMemberToMasqueradeAs() {
+ public InternalDistributedMember getMemberToMasqueradeAs() {
if (txMemberId == null) {
return getSender();
}
return txMemberId;
}
-
-
/**
* Severe alert processing enables suspect processing at the ack-wait-threshold and issuing of a
* severe alert at the end of the ack-severe-alert-threshold. Some messages should not support
@@ -669,11 +662,6 @@ public abstract class PartitionMessage extends DistributionMessage
// subclasses that support routing to clients should reimplement this method
}
- /*
- * public void appendOldValueToMessage(EntryEventImpl event) {
- *
- * }
- */
/**
* @return the txUniqId
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
index 7ee54d8..1898461 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -342,7 +342,6 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
@Override
protected Object clone() throws CloneNotSupportedException {
- // TODO Auto-generated method stub
return super.clone();
}
@@ -629,9 +628,8 @@ public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
RemoveAllReplyMessage.send(member, procId, getReplySender(dm), this.result, this.versions, ex);
}
-
@Override
- protected final void appendFields(StringBuilder buff) {
+ protected void appendFields(StringBuilder buff) {
super.appendFields(buff);
buff.append("; removeAllPRDataSize=").append(removeAllPRDataSize).append("; bucketId=")
.append(bucketId);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
index a8ff068..6650549 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
@@ -45,7 +45,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* Usage: RemoveBucketResponse response = RemoveBucketMessage.send( InternalDistributedMember,
* PartitionedRegion, int bucketId); if (response != null && response.waitForResponse()) { // bucket
* was removed }
- *
*/
public class RemoveBucketMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
@@ -53,7 +52,6 @@ public class RemoveBucketMessage extends PartitionMessage {
private int bucketId;
private boolean forceRemovePrimary;
-
/**
* Empty constructor to satisfy {@link DataSerializer} requirements
*/
@@ -103,8 +101,8 @@ public class RemoveBucketMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
PartitionedRegionDataStore dataStore = region.getDataStore();
boolean removed = dataStore.removeBucket(this.bucketId, this.forceRemovePrimary);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
index 0c6aea8..a6c9707 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/SizeMessage.java
@@ -110,7 +110,7 @@ public class SizeMessage extends PartitionMessage {
* of the initialization
*/
@Override
- protected final boolean failIfRegionMissing() {
+ protected boolean failIfRegionMissing() {
return false;
}
@@ -154,10 +154,6 @@ public class SizeMessage extends PartitionMessage {
sizes = ds.getSizeForLocalBuckets();
}
}
- // if (logger.isTraceEnabled(LogMarker.DM)) {
- // l.fine(getClass().getName() + " send sizes back using processorId: "
- // + getProcessorId());
- // }
r.getPrStats().endPartitionMessagesProcessing(startTime);
SizeReplyMessage.send(getSender(), getProcessorId(), dm, sizes);
} // datastore exists
@@ -270,7 +266,7 @@ public class SizeMessage extends PartitionMessage {
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
- this.bucketSizes = (Map<Integer, SizeEntry>) DataSerializer.readObject(in);
+ this.bucketSizes = DataSerializer.readObject(in);
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index 728abf7..291db65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -1872,11 +1872,11 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
this.stats.close();
}
- public final void incReceivedBytes(long v) {
+ public void incReceivedBytes(long v) {
this.stats.incLong(receivedBytesId, v);
}
- public final void incSentBytes(long v) {
+ public void incSentBytes(long v) {
// noop since we never send messages
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
index 889980f..cfe812c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Part.java
@@ -34,14 +34,15 @@ import org.apache.geode.internal.offheap.StoredObject;
* to edge requests
*
* @see Message
- *
* @since GemFire 2.0.2
*/
public class Part {
+
private static final byte BYTE_CODE = 0;
private static final byte OBJECT_CODE = 1;
private Version version;
+
/**
* Used to represent and empty byte array for bug 36279
*
@@ -68,7 +69,6 @@ public class Part {
this.typeCode = tc;
}
-
public void clear() {
if (this.part != null) {
if (this.part instanceof HeapDataOutputStream) {
@@ -249,7 +249,6 @@ public class Part {
| ((((long) bytes[6]) << 8) & 0x000000000000FF00l) | (bytes[7] & 0x00000000000000FFl);
}
-
public byte[] getSerializedForm() {
if (this.part == null) {
return null;
@@ -291,7 +290,7 @@ public class Part {
*
* @param buf the buffer to use if any data needs to be copied to one
*/
- public final void writeTo(OutputStream out, ByteBuffer buf) throws IOException {
+ public void writeTo(OutputStream out, ByteBuffer buf) throws IOException {
if (getLength() > 0) {
if (this.part instanceof byte[]) {
byte[] bytes = (byte[]) this.part;
@@ -436,19 +435,6 @@ public class Part {
sb.append("partCode=");
sb.append(typeCodeToString(this.typeCode));
sb.append(" partLength=" + getLength());
- // sb.append(" partBytes=");
- // byte[] b = getSerializedForm();
- // if (b == null) {
- // sb.append("null");
- // }
- // else {
- // sb.append("(");
- // for (int i = 0; i < b.length; i ++) {
- // sb.append(Integer.toString(b[i]));
- // sb.append(" ");
- // }
- // sb.append(")");
- // }
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 39f30d6..f8771f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -904,28 +904,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
throw new UnsupportedOperationException();
}
- /**
- * TODO: Optimization needed. We are creating 1 array list for each peek!!
- *
- * @return BucketRegionQueue
- */
- private final BucketRegionQueue getRandomBucketRegionQueue() {
- PartitionedRegion prQ = getRandomShadowPR();
- if (prQ != null) {
- final PartitionedRegionDataStore ds = prQ.getDataStore();
- final List<Integer> buckets = new ArrayList<Integer>(ds.getAllLocalPrimaryBucketIds());
- if (buckets.isEmpty())
- return null;
- final int index = new Random().nextInt(buckets.size());
- final int brqId = buckets.get(index);
- final BucketRegionQueue brq = (BucketRegionQueue) ds.getLocalBucketById(brqId);
- if (brq.isReadyForPeek()) {
- return brq;
- }
- }
- return null;
- }
-
protected boolean areLocalBucketQueueRegionsPresent() {
boolean bucketsAvailable = false;
for (PartitionedRegion prQ : this.userRegionNameToshadowPRMap.values()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
index d38b2c7..b23615a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation.java
@@ -126,13 +126,6 @@ public class BatchDestroyOperation extends DistributedCacheOperation {
}
}
}
- // Non-optimized way
- // for (Long k : (Set<Long>)rgn.keys()) {
- // if (k > this.tailKey) {
- // continue;
- // }
- // rgn.localDestroy(k, RegionQueue.WAN_QUEUE_TOKEN);
- // }
this.appliedOperation = true;
} catch (CacheWriterException e) {
throw new Error(
@@ -147,8 +140,7 @@ public class BatchDestroyOperation extends DistributedCacheOperation {
@Override
@Retained
- protected final InternalCacheEvent createEvent(DistributedRegion rgn)
- throws EntryNotFoundException {
+ protected InternalCacheEvent createEvent(DistributedRegion rgn) throws EntryNotFoundException {
EntryEventImpl ev = createEntryEvent(rgn);
boolean evReturned = false;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreation.java
index 9501666..9eb6dfe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreation.java
@@ -28,24 +28,20 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Represents a {@link CacheTransactionManager} that is created declaratively.
*
- *
* @since GemFire 4.0
*/
public class CacheTransactionManagerCreation implements CacheTransactionManager {
- /////////////////////// Instance Fields ///////////////////////
-
/** The TransactionListener instance set using the cache's CacheTransactionManager */
private final ArrayList txListeners = new ArrayList();
+
private TransactionWriter writer = null;
- /////////////////////// Constructors ///////////////////////
/**
* Creates a new <code>CacheTransactionManagerCreation</code>
*/
public CacheTransactionManagerCreation() {}
- ////////////////////// Instance Methods //////////////////////
public TransactionListener setListener(TransactionListener newListener) {
TransactionListener result = getListener();
this.txListeners.clear();
@@ -78,7 +74,7 @@ public class CacheTransactionManagerCreation implements CacheTransactionManager
return result;
}
- public final TransactionListener getListener() {
+ public TransactionListener getListener() {
if (this.txListeners.isEmpty()) {
return null;
} else if (this.txListeners.size() == 1) {
@@ -120,7 +116,7 @@ public class CacheTransactionManagerCreation implements CacheTransactionManager
.toLocalizedString());
}
- public final void setWriter(TransactionWriter writer) {
+ public void setWriter(TransactionWriter writer) {
this.writer = writer;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
index 413fc4a..460f107 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersion.java
@@ -19,12 +19,13 @@ import java.util.HashMap;
/**
* {@link Enum} for Cache XML versions. Resolves issues with old String based comparisons. Under the
* old String comparison version "8.1" was older than "8_0" and "10.0" was older than "9.0".
- *
+ * <p>
+ * TODO future - replace constants in CacheXml with this Enum completely
*
* @since GemFire 8.1
*/
-// TODO future - replace constants in CacheXml with this Enum completely
public enum CacheXmlVersion {
+
GEMFIRE_3_0(CacheXml.VERSION_3_0, CacheXml.PUBLIC_ID_3_0, CacheXml.SYSTEM_ID_3_0, null, null),
GEMFIRE_4_0(CacheXml.VERSION_4_0, CacheXml.PUBLIC_ID_4_0, CacheXml.SYSTEM_ID_4_0, null, null),
GEMFIRE_4_1(CacheXml.VERSION_4_1, CacheXml.PUBLIC_ID_4_1, CacheXml.SYSTEM_ID_4_1, null, null),
@@ -132,7 +133,7 @@ public enum CacheXmlVersion {
* @throws IllegalArgumentException if version does not exist.
* @since GemFire 8.1
*/
- public static final CacheXmlVersion valueForVersion(final String version) {
+ public static CacheXmlVersion valueForVersion(final String version) {
final CacheXmlVersion cacheXmlVersion = valuesForVersion.get(version);
if (null == cacheXmlVersion) {
throw new IllegalArgumentException("No enum constant "
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
index 728cab4..410ca0c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache.xmlcache;
import java.io.IOException;
@@ -26,12 +25,12 @@ import org.apache.geode.internal.ClassPathLoader;
/**
* Default behavior for EntityResolver2 implementations.
- *
+ * <p>
+ * UnitTest PivotalEntityResolverJUnitTest and DefaultEntityResolver2Test
*
* @since GemFire 8.1
*/
-// UnitTest PivotalEntityResolverJUnitTest
-abstract public class DefaultEntityResolver2 implements EntityResolver2 {
+public abstract class DefaultEntityResolver2 implements EntityResolver2 {
@Override
public InputSource resolveEntity(final String publicId, final String systemId)
@@ -58,7 +57,7 @@ abstract public class DefaultEntityResolver2 implements EntityResolver2 {
* @return InputSource if resource found, otherwise null.
* @since GemFire 8.1
*/
- protected final InputSource getClassPathInputSource(final String publicId, final String systemId,
+ protected InputSource getClassPathInputSource(final String publicId, final String systemId,
final String path) {
final InputStream stream = ClassPathLoader.getLatest().getResourceAsStream(getClass(), path);
if (null == stream) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
index 3d375ad..71f491c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
@@ -140,7 +140,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
*
* @throws GemFireIOException if the archive file could not be closed.
*/
- public final void close() {
+ public void close() {
try {
this.dataOut.flush();
if (this.trace) {
@@ -176,7 +176,7 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
* Returns the number of bytes written so far to this archive. This does not take compression into
* account.
*/
- public final long bytesWritten() {
+ public long bytesWritten() {
return this.dataOut.getBytesWritten();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index e59821d..4e450c7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -14,52 +14,82 @@
*/
package org.apache.geode.internal.tcp;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.ConflationKey;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DMStats;
+import org.apache.geode.distributed.internal.DirectReplyProcessor;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.ReplySender;
import org.apache.geode.distributed.internal.direct.DirectChannel;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.ByteArrayDataInput;
+import org.apache.geode.internal.DSFIDFactory;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.SystemTimer.SystemTimerTask;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.AlertAppender;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.internal.net.*;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.tcp.MsgReader.Header;
import org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
import org.apache.logging.log4j.Logger;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.Inet6Address;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.SocketChannel;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
- * <p>
* Connection is a socket holder that sends and receives serialized message objects. A Connection
* may be closed to preserve system resources and will automatically be reopened when it's needed.
- * </p>
- *
+ *
* @since GemFire 2.0
- *
*/
-
public class Connection implements Runnable {
private static final Logger logger = LogService.getLogger();
@@ -153,6 +183,7 @@ public class Connection implements Runnable {
*/
private static final boolean DOMINO_THREAD_OWNED_SOCKETS =
Boolean.getBoolean("p2p.ENABLE_DOMINO_THREAD_OWNED_SOCKETS");
+
private final static ThreadLocal isDominoThread = new ThreadLocal();
// return true if this thread is a reader thread
@@ -214,22 +245,13 @@ public class Connection implements Runnable {
}
};
- // /**
- // * name of sender thread thread. Useful in finding out why a reader
- // * thread was created. Add sending of the name in handshakes and
- // * add it to the name of the reader thread (the code is there but commented out)
- // */
- // private String senderName = null;
-
- // If we are a sender then we want to know if the receiver on the
- // other end is willing to have its messages queued. The following
- // four "async" inst vars come from his handshake response.
/**
* How long to wait if receiver will not accept a message before we go into queue mode.
*
* @since GemFire 4.2.2
*/
private int asyncDistributionTimeout = 0;
+
/**
* How long to wait, with the receiver not accepting any messages, before kicking the receiver out
* of the distributed system. Ignored if asyncDistributionTimeout is zero.
@@ -237,6 +259,7 @@ public class Connection implements Runnable {
* @since GemFire 4.2.2
*/
private int asyncQueueTimeout = 0;
+
/**
* How much queued data we can have, with the receiver not accepting any messages, before kicking
* the receiver out of the distributed system. Ignored if asyncDistributionTimeout is zero.
@@ -245,6 +268,7 @@ public class Connection implements Runnable {
* @since GemFire 4.2.2
*/
private long asyncMaxQueueSize = 0;
+
/**
* True if an async queue is already being filled.
*/
@@ -256,9 +280,6 @@ public class Connection implements Runnable {
*/
private final Map conflatedKeys = new HashMap();
- // private final Queue outgoingQueue = new LinkedBlockingQueue();
-
-
// NOTE: LinkedBlockingQueue has a bug in which removes from the queue
// cause future offer to increase the size without adding anything to the queue.
// So I've changed from this backport class to a java.util.LinkedList
@@ -298,13 +319,6 @@ public class Connection implements Runnable {
/** message reader thread */
private volatile Thread readerThread;
- // /**
- // * When a thread owns the outLock and is writing to the socket, it must
- // * be placed in this variable so that it can be interrupted should the
- // * socket need to be closed.
- // */
- // private volatile Thread writerThread;
-
/** whether the reader thread is, or should be, running */
volatile boolean stopped = true;
@@ -330,9 +344,6 @@ public class Connection implements Runnable {
*/
private SystemTimer.SystemTimerTask ackTimeoutTask;
- // State for ackTimeoutTask: transmissionStartTime, ackWaitTimeout, ackSATimeout,
- // ackConnectionGroup, ackThreadName
-
/**
* millisecond clock at the time message transmission started, if doing forced-disconnect
* processing
@@ -354,7 +365,6 @@ public class Connection implements Runnable {
/** name of thread that we're currently performing an operation in (may be null) */
String ackThreadName;
-
/** the buffer used for NIO message receipt */
ByteBuffer nioInputBuffer;
@@ -514,7 +524,6 @@ public class Connection implements Runnable {
}
}
c.waitForHandshake();
- // sendHandshakeReplyOK();
c.finishedConnecting = true;
return c;
}
@@ -540,8 +549,6 @@ public class Connection implements Runnable {
try {
socket.setTcpNoDelay(true);
socket.setKeepAlive(true);
- // socket.setSoLinger(true, (Integer.valueOf(System.getProperty("p2p.lingerTime",
- // "5000"))).intValue());
setSendBufferSize(socket, SMALL_BUFFER_SIZE);
setReceiveBufferSize(socket);
} catch (SocketException e) {
@@ -922,17 +929,6 @@ public class Connection implements Runnable {
os.writeLong(this.uniqueId);
Version.CURRENT.writeOrdinal(os, true);
os.writeInt(dominoCount.get() + 1);
- // this writes the sending member + thread name that is stored in senderName
- // on the receiver to show the cause of reader thread creation
- // if (dominoCount.get() > 0) {
- // os.writeUTF(Thread.currentThread().getName());
- // } else {
- // String name = owner.getDM().getConfig().getName();
- // if (name == null) {
- // name = "pid="+OSProcess.getId();
- // }
- // os.writeUTF("["+name+"] "+Thread.currentThread().getName());
- // }
os.flush();
byte[] msg = baos.toByteArray();
@@ -1268,8 +1264,6 @@ public class Connection implements Runnable {
this.socket = channel.socket();
} else {
if (TCPConduit.useSSL) {
- // socket = javax.net.ssl.SSLSocketFactory.getDefault()
- // .createSocket(remoteAddr.getInetAddress(), remoteAddr.getPort());
int socketBufferSize =
sharedResource ? SMALL_BUFFER_SIZE : this.owner.getConduit().tcpBufferSize;
this.socket = owner.getConduit().getSocketCreator().connectForServer(
@@ -3283,7 +3277,7 @@ public class Connection implements Runnable {
* @param forceAsync true if we need to force a blocking async write.
* @throws ConnectionException if the conduit has stopped
*/
- protected final void nioWriteFully(SocketChannel channel, ByteBuffer buffer, boolean forceAsync,
+ protected void nioWriteFully(SocketChannel channel, ByteBuffer buffer, boolean forceAsync,
DistributionMessage msg) throws IOException, ConnectionException {
final DMStats stats = this.owner.getConduit().stats;
if (!this.sharedResource) {
@@ -3356,7 +3350,6 @@ public class Connection implements Runnable {
protected static final byte STATE_RECEIVED_ACK = 4;
/** the connection is in use and is reading a message */
protected static final byte STATE_READING = 5;
-
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/** set to true if we exceeded the ack-wait-threshold waiting for a response */
@@ -3378,7 +3371,6 @@ public class Connection implements Runnable {
this.connectionState = STATE_READING_ACK;
}
-
boolean origSocketInUse = this.socketInUse;
this.socketInUse = true;
MsgReader msgReader = null;
@@ -3474,7 +3466,6 @@ public class Connection implements Runnable {
}
}
-
/**
* processes the current NIO buffer. If there are complete messages in the buffer, they are
* deserialized and passed to TCPConduit for further processing
@@ -3916,14 +3907,10 @@ public class Connection implements Runnable {
}
private void setThreadName(int dominoNumber) {
- Thread.currentThread().setName(
- // (!this.sharedResource && this.senderName != null? ("<"+this.senderName+"> ->
- // ") : "") +
- // "[" + name + "] "+
- "P2P message reader for " + this.remoteAddr + " " + (this.sharedResource ? "" : "un")
- + "shared" + " " + (this.preserveOrder ? "" : "un") + "ordered" + " uid="
- + this.uniqueId + (dominoNumber > 0 ? (" dom #" + dominoNumber) : "") + " port="
- + this.socket.getPort());
+ Thread.currentThread().setName("P2P message reader for " + this.remoteAddr + " "
+ + (this.sharedResource ? "" : "un") + "shared" + " " + (this.preserveOrder ? "" : "un")
+ + "ordered" + " uid=" + this.uniqueId + (dominoNumber > 0 ? (" dom #" + dominoNumber) : "")
+ + " port=" + this.socket.getPort());
}
private void compactOrResizeBuffer(int messageLength) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
index ce5ba45..4063457 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
@@ -21,10 +21,9 @@ import javax.management.openmbean.OpenType;
/**
* Converter for classes where the open data is identical to the original data. This is true for any
* of the SimpleType types, and for an any-dimension array of those
- *
- *
*/
public class IdentityConverter extends OpenTypeConverter {
+
IdentityConverter(Type targetType, OpenType openType, Class openClass) {
super(targetType, openType, openClass);
}
@@ -33,7 +32,7 @@ public class IdentityConverter extends OpenTypeConverter {
return true;
}
- final Object toNonNullOpenValue(Object value) {
+ Object toNonNullOpenValue(Object value) {
return value;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
index 4fdf291..0fb2b39 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
@@ -76,13 +76,12 @@ import org.apache.geode.management.ManagementException;
*
* Apart from simple types, arrays, and collections, Java types are converted through introspection
* into CompositeType
- *
- *
*/
public abstract class OpenTypeConverter {
private final Type targetType;
- /*
+
+ /**
* The Java class corresponding to getOpenType(). This is the class named by
* getOpenType().getClassName(), except that it may be a primitive type or an array of primitive
* type.
@@ -113,9 +112,7 @@ public abstract class OpenTypeConverter {
/**
* Convert an instance of openClass into an instance of targetType.
*
- * @param value
* @return the java type object
- * @throws InvalidObjectException
*/
public Object fromOpenValue(Object value) throws InvalidObjectException {
if (value == null)
@@ -129,8 +126,6 @@ public abstract class OpenTypeConverter {
/**
* Throw an appropriate InvalidObjectException if we will not be able to convert back from the
* open data to the original Java object.
- *
- * @throws InvalidObjectException
*/
void checkReconstructible() throws InvalidObjectException {
// subclasses can override
@@ -139,9 +134,7 @@ public abstract class OpenTypeConverter {
/**
* Convert an instance of targetType into an instance of openClass.
*
- * @param value
* @return open class object
- * @throws OpenDataException
*/
Object toOpenValue(Object value) throws OpenDataException {
if (value == null)
@@ -153,7 +146,6 @@ public abstract class OpenTypeConverter {
abstract Object toNonNullOpenValue(Object value) throws OpenDataException;
/**
- *
* @return True if and only if this OpenTypeConverter's toOpenValue and fromOpenValue methods are
* the identity function.
*/
@@ -174,8 +166,6 @@ public abstract class OpenTypeConverter {
}
/**
- *
- * @param type
* @return a converter corresponding to a type
*/
private static synchronized OpenTypeConverter getConverter(Type type) {
@@ -192,9 +182,6 @@ public abstract class OpenTypeConverter {
/**
* Put the converter in the map to avoid future creation
- *
- * @param type
- * @param conv
*/
private static synchronized void putConverter(Type type, OpenTypeConverter conv) {
WeakReference<OpenTypeConverter> wr = new WeakReference<OpenTypeConverter>(conv);
@@ -206,7 +193,7 @@ public abstract class OpenTypeConverter {
preDefinedConverters.add(conv);
}
- /**
+ /*
* Static block to initialize pre defined convertor
*/
static {
@@ -250,10 +237,7 @@ public abstract class OpenTypeConverter {
}
/**
- *
- * @param objType
* @return the converter for the given Java type, creating it if necessary
- * @throws OpenDataException
*/
public static synchronized OpenTypeConverter toConverter(Type objType) throws OpenDataException {
@@ -281,10 +265,7 @@ public abstract class OpenTypeConverter {
}
/**
- *
- * @param objType
- * @return the open type converrter for a given type
- * @throws OpenDataException
+ * @return the open type converter for a given type
*/
private static OpenTypeConverter makeConverter(Type objType) throws OpenDataException {
@@ -346,6 +327,7 @@ public abstract class OpenTypeConverter {
}
protected static final String[] keyArray = {"key"};
+
protected static final String[] keyValueArray = {"key", "value"};
private static OpenTypeConverter makeTabularConverter(Type objType, boolean sortedMap,
@@ -363,16 +345,14 @@ public abstract class OpenTypeConverter {
}
/**
- * Supprted types are List<E>, Set<E>, SortedSet<E>, Map<K,V>, SortedMap<K,V>.
+ * Supported types are List<E>, Set<E>, SortedSet<E>, Map<K,V>, SortedMap<K,V>.
*
* Subclasses of the above types wont be supported as deserialize info wont be there.
*
* Queue<E> won't be supported as Queue is more of a functional data structure rather than a data
* holder
*
- * @param objType
- * @return the open type converrter for a given type
- * @throws OpenDataException
+ * @return the open type converter for a given type
*/
private static OpenTypeConverter makeParameterizedConverter(ParameterizedType objType)
throws OpenDataException {
@@ -402,10 +382,7 @@ public abstract class OpenTypeConverter {
}
/**
- *
- * @param c
* @return the open type converrter for a given type
- * @throws OpenDataException
*/
private static OpenTypeConverter makeCompositeConverter(Class c) throws OpenDataException {
@@ -456,8 +433,6 @@ public abstract class OpenTypeConverter {
/**
* Converts from a CompositeData to an instance of the targetClass Various subclasses override its
* functionality.
- *
- *
*/
protected static abstract class CompositeBuilder {
CompositeBuilder(Class targetClass, String[] itemNames) {
@@ -477,10 +452,8 @@ public abstract class OpenTypeConverter {
* If the subclass should be appropriate but there is a problem, then the method throws
* InvalidObjectException.
*
- * @param getters
* @return If the subclass is appropriate for targetClass, then the method returns null. If the
* subclass is not appropriate, then the method returns an explanation of why not.
- * @throws InvalidObjectException
*/
abstract String applicable(Method[] getters) throws InvalidObjectException;
@@ -493,12 +466,7 @@ public abstract class OpenTypeConverter {
}
/**
- *
- * @param cd
- * @param itemNames
- * @param converters
* @return Actual java types from the composite type
- * @throws InvalidObjectException
*/
abstract Object fromCompositeData(CompositeData cd, String[] itemNames,
OpenTypeConverter[] converters) throws InvalidObjectException;
@@ -509,8 +477,6 @@ public abstract class OpenTypeConverter {
/**
* Builder if the target class has a method "public static from(CompositeData)"
- *
- *
*/
protected static class CompositeBuilderViaFrom extends CompositeBuilder {
@@ -545,8 +511,8 @@ public abstract class OpenTypeConverter {
}
}
- final Object fromCompositeData(CompositeData cd, String[] itemNames,
- OpenTypeConverter[] converters) throws InvalidObjectException {
+ Object fromCompositeData(CompositeData cd, String[] itemNames, OpenTypeConverter[] converters)
+ throws InvalidObjectException {
try {
return fromMethod.invoke(null, cd);
} catch (Exception e) {
@@ -566,8 +532,6 @@ public abstract class OpenTypeConverter {
* are candidate builders. Instead, the "applicable" method will return an explanatory string, and
* the other builders will be skipped. If all the getters are OK, then the "applicable" method
* will return an empty string and the other builders will be tried.
- *
- *
*/
protected static class CompositeBuilderCheckGetters extends CompositeBuilder {
CompositeBuilderCheckGetters(Class targetClass, String[] itemNames,
@@ -604,8 +568,6 @@ public abstract class OpenTypeConverter {
/**
* Builder if the target class has a setter for every getter
- *
- *
*/
protected static class CompositeBuilderViaSetters extends CompositeBuilder {
@@ -664,8 +626,6 @@ public abstract class OpenTypeConverter {
/**
* Builder if the target class has a constructor that is annotated with @ConstructorProperties so
* we can derive the corresponding getters.
- *
- *
*/
protected static class CompositeBuilderViaConstructor extends CompositeBuilder {
@@ -848,8 +808,6 @@ public abstract class OpenTypeConverter {
* Builder if the target class is an interface and contains no methods other than getters. Then we
* can make an instance using a dynamic proxy that forwards the getters to the source
* CompositeData
- *
- *
*/
protected static class CompositeBuilderViaProxy extends CompositeBuilder {
@@ -882,8 +840,7 @@ public abstract class OpenTypeConverter {
return null;
}
- final Object fromCompositeData(CompositeData cd, String[] itemNames,
- OpenTypeConverter[] converters) {
+ Object fromCompositeData(CompositeData cd, String[] itemNames, OpenTypeConverter[] converters) {
final Class targetClass = getTargetClass();
return Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[] {targetClass},
new CompositeDataInvocationHandler(cd));
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
index fd9461f..107ac0b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
@@ -42,8 +42,6 @@ import org.apache.geode.pdx.PdxInstance;
*
* Although it has limited functionality,still a simple use of add() method should suffice for most
* of the simple JSON use cases.
- *
- *
*/
public class TypedJson {
@@ -137,7 +135,6 @@ public class TypedJson {
}
}
-
}
}
}
@@ -150,9 +147,7 @@ public class TypedJson {
}
}
-
/**
- *
* User can build on this object by adding Objects against a key.
*
* TypedJson result = new TypedJson(); result.add(KEY,object); If users add more objects against
@@ -218,7 +213,6 @@ public class TypedJson {
commanate = false;
addComma = true;
}
-
}
writer.write('}');
@@ -312,7 +306,7 @@ public class TypedJson {
return false;
}
- final void writeVal(Writer w, Object value) throws IOException {
+ void writeVal(Writer w, Object value) throws IOException {
w.write('{');
addVal(w, value);
w.write('}');
@@ -325,7 +319,6 @@ public class TypedJson {
if (shouldVisitChildren(object)) {
visitChildrens(w, object, true);
}
-
}
void writeKeyValue(Writer w, Object key, Object value, Class type) throws IOException {
@@ -379,7 +372,6 @@ public class TypedJson {
}
void writeArray(Writer w, Object object) throws IOException {
-
if (commanate) {
w.write(",");
}
@@ -419,7 +411,6 @@ public class TypedJson {
for (int i = 0; i < length && elements < queryCollectionsDepth; i += 1) {
Object item = Array.get(object, i);
items.add(item);
-
}
return items;
}
@@ -463,7 +454,6 @@ public class TypedJson {
endType(w, rootClazz);
} catch (IOException e) {
}
-
}
void startKey(Writer writer, String key) throws IOException {
@@ -478,7 +468,6 @@ public class TypedJson {
if (key != null) {
writer.write('}');
}
-
}
List<Object> visitSpecialObjects(Writer w, Object object, boolean write) throws IOException {
@@ -563,8 +552,6 @@ public class TypedJson {
} else {
elements.add(fieldValue);
}
-
-
}
if (write)
w.write('}');
@@ -593,7 +580,6 @@ public class TypedJson {
return elements;
}
-
if (object instanceof Region.Entry) {
Region.Entry entry = (Region.Entry) object;
Object key = entry.getKey();
@@ -608,11 +594,9 @@ public class TypedJson {
elements.add(value);
}
-
return elements;
}
-
return elements;
}
@@ -627,7 +611,6 @@ public class TypedJson {
/**
* Handle some special GemFire classes. We don't want to expose some of the internal classes.
* Hence corresponding interface or external classes should be shown.
- *
*/
String internalToExternal(Class clazz, Object value) {
if (value != null && value instanceof Region.Entry) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
index 3ec04c7..0dbd5f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
@@ -77,7 +77,7 @@ public class Link implements Comparable<Link>, Serializable {
return href;
}
- public final void setHref(final URI href) {
+ public void setHref(final URI href) {
assert href != null : "The Link href URI cannot be null!";
this.href = href;
}
@@ -87,7 +87,7 @@ public class Link implements Comparable<Link>, Serializable {
return method;
}
- public final void setMethod(final HttpMethod method) {
+ public void setMethod(final HttpMethod method) {
this.method = ObjectUtils.defaultIfNull(method, DEFAULT_HTTP_METHOD);
}
@@ -96,7 +96,7 @@ public class Link implements Comparable<Link>, Serializable {
return relation;
}
- public final void setRelation(final String relation) {
+ public void setRelation(final String relation) {
assert StringUtils.isNotBlank(relation) : "The Link relation (rel) must be specified!";
this.relation = relation;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/management/internal/web/http/ClientHttpRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/ClientHttpRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/ClientHttpRequest.java
index ea9c81c..43657b9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/ClientHttpRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/ClientHttpRequest.java
@@ -117,7 +117,7 @@ public class ClientHttpRequest implements HttpRequest {
* @return the Link encapsulating the URI and method for the client's HTTP request.
* @see org.apache.geode.management.internal.web.domain.Link
*/
- public final Link getLink() {
+ public Link getLink() {
return link;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractScanExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractScanExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractScanExecutor.java
index 0eb6dca..716c3f4 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractScanExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/AbstractScanExecutor.java
@@ -20,7 +20,6 @@ import java.util.regex.Pattern;
import org.apache.geode.redis.internal.org.apache.hadoop.fs.GlobPattern;
-
public abstract class AbstractScanExecutor extends AbstractExecutor {
protected final String ERROR_CURSOR = "Invalid cursor";
@@ -39,9 +38,10 @@ public abstract class AbstractScanExecutor extends AbstractExecutor {
* @param pattern A glob pattern.
* @return A regex pattern to recognize the given glob pattern.
*/
- protected final Pattern convertGlobToRegex(String pattern) {
- if (pattern == null)
+ protected Pattern convertGlobToRegex(String pattern) {
+ if (pattern == null) {
return null;
+ }
return GlobPattern.compile(pattern);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
new file mode 100644
index 0000000..e550981
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DataSerializerTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DataSerializer mockDataSerializer = mock(DataSerializer.class);
+ EventID mockEventID = mock(EventID.class);
+ ClientProxyMembershipID mockClientProxyMembershipID = mock(ClientProxyMembershipID.class);
+
+ when(mockDataSerializer.getEventId()).thenReturn(mockEventID);
+ when(mockDataSerializer.getContext()).thenReturn(mockClientProxyMembershipID);
+
+ mockDataSerializer.setEventId(mockEventID);
+ mockDataSerializer.setContext(mockClientProxyMembershipID);
+
+ verify(mockDataSerializer, times(1)).setEventId(mockEventID);
+ verify(mockDataSerializer, times(1)).setContext(mockClientProxyMembershipID);
+
+ assertThat(mockDataSerializer.getEventId()).isSameAs(mockEventID);
+ assertThat(mockDataSerializer.getContext()).isSameAs(mockClientProxyMembershipID);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
new file mode 100644
index 0000000..6a20872
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class InstantiatorTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ Instantiator mockInstantiator = mock(Instantiator.class);
+ EventID mockEventID = mock(EventID.class);
+ ClientProxyMembershipID mockClientProxyMembershipID = mock(ClientProxyMembershipID.class);
+
+ when(mockInstantiator.getInstantiatedClass()).thenReturn(null);
+ when(mockInstantiator.getId()).thenReturn(0);
+ when(mockInstantiator.getEventId()).thenReturn(mockEventID);
+ when(mockInstantiator.getContext()).thenReturn(mockClientProxyMembershipID);
+
+ mockInstantiator.setEventId(mockEventID);
+ mockInstantiator.setContext(mockClientProxyMembershipID);
+
+ verify(mockInstantiator, times(1)).setEventId(mockEventID);
+ verify(mockInstantiator, times(1)).setContext(mockClientProxyMembershipID);
+
+ assertThat(mockInstantiator.getEventId()).isSameAs(mockEventID);
+ assertThat(mockInstantiator.getContext()).isSameAs(mockClientProxyMembershipID);
+ assertThat(mockInstantiator.getInstantiatedClass()).isNull();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
new file mode 100644
index 0000000..10c0beb
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.admin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Collections;
+
+@Category(UnitTest.class)
+public class RegionSubRegionSnapshotTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RegionSubRegionSnapshot mockRegionSubRegionSnapshot = mock(RegionSubRegionSnapshot.class);
+ RegionSubRegionSnapshot mockRegionSubRegionSnapshotParent = mock(RegionSubRegionSnapshot.class);
+
+ when(mockRegionSubRegionSnapshot.getEntryCount()).thenReturn(0);
+ when(mockRegionSubRegionSnapshot.getName()).thenReturn("name");
+ when(mockRegionSubRegionSnapshot.getSubRegionSnapshots()).thenReturn(Collections.emptySet());
+ when(mockRegionSubRegionSnapshot.getParent()).thenReturn(mockRegionSubRegionSnapshotParent);
+
+ mockRegionSubRegionSnapshot.setEntryCount(1);
+ mockRegionSubRegionSnapshot.setName("NAME");
+ mockRegionSubRegionSnapshot.setSubRegionSnapshots(null);
+ mockRegionSubRegionSnapshot.setParent(null);
+
+ verify(mockRegionSubRegionSnapshot, times(1)).setEntryCount(1);
+ verify(mockRegionSubRegionSnapshot, times(1)).setName("NAME");
+ verify(mockRegionSubRegionSnapshot, times(1)).setSubRegionSnapshots(null);
+ verify(mockRegionSubRegionSnapshot, times(1)).setParent(null);
+
+ assertThat(mockRegionSubRegionSnapshot.getEntryCount()).isEqualTo(0);
+ assertThat(mockRegionSubRegionSnapshot.getName()).isEqualTo("name");
+ assertThat(mockRegionSubRegionSnapshot.getSubRegionSnapshots())
+ .isEqualTo(Collections.emptySet());
+ assertThat(mockRegionSubRegionSnapshot.getParent()).isSameAs(mockRegionSubRegionSnapshotParent);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index 18af019..b81c08f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -106,7 +106,7 @@ public class ConnectionPoolFactoryJUnitTest {
}
@Test
- public final void testCreateDefaultAndInvalidAndLegitAttributes() {
+ public void testCreateDefaultAndInvalidAndLegitAttributes() {
PoolFactory cpf = PoolManager.createFactory();
((PoolFactoryImpl) cpf).setStartDisabled(true);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
new file mode 100644
index 0000000..31019f7
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DiskAccessExceptionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DiskAccessException mockDiskAccessException = mock(DiskAccessException.class);
+ when(mockDiskAccessException.isRemote()).thenReturn(true);
+ assertThat(mockDiskAccessException.isRemote()).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
new file mode 100644
index 0000000..ef1f514
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.client.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractOpTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractOp mockAbstractOp = mock(AbstractOp.class);
+ Object mockObject = mock(Object.class);
+ when(mockAbstractOp.processObjResponse(any(), anyString())).thenReturn(mockObject);
+ assertThat(mockAbstractOp.processObjResponse(mock(Message.class), "string"))
+ .isEqualTo(mockObject);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
new file mode 100644
index 0000000..daa90ba
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.execute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Category(UnitTest.class)
+public class FunctionExceptionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ FunctionException mockFunctionException = mock(FunctionException.class);
+ Exception cause = new Exception();
+ List<Exception> exceptions = new ArrayList<>();
+ exceptions.add(cause);
+
+ when(mockFunctionException.getExceptions()).thenReturn(Collections.emptyList());
+
+ mockFunctionException.addException(cause);
+ mockFunctionException.addExceptions(exceptions);
+
+ verify(mockFunctionException, times(1)).addException(cause);
+ verify(mockFunctionException, times(1)).addExceptions(exceptions);
+
+ assertThat(mockFunctionException.getExceptions()).isEmpty();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
index 9655ab4..7a106b5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
@@ -195,7 +195,7 @@ public class PdxOrderByJUnitTest {
}
- final public Region createRegion(String name, String rootName, RegionAttributes attrs)
+ public Region createRegion(String name, String rootName, RegionAttributes attrs)
throws CacheException {
Region root = getRootRegion(rootName);
if (root == null) {
@@ -220,11 +220,11 @@ public class PdxOrderByJUnitTest {
return root.createSubregion(name, attrs);
}
- public final Region getRootRegion(String rootName) {
+ public Region getRootRegion(String rootName) {
return CacheUtils.getRegion(rootName);
}
- public final Region createRootRegion(String rootName, RegionAttributes attrs)
+ public Region createRootRegion(String rootName, RegionAttributes attrs)
throws RegionExistsException, TimeoutException {
return ((GemFireCacheImpl) CacheUtils.getCache()).createRegion(rootName, attrs);
}
[12/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java
index a92b2b1..43a24a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java
@@ -15,21 +15,29 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -37,16 +45,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegionEntryHeap {
public VersionedStatsRegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -77,9 +100,11 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -88,10 +113,11 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -111,7 +137,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -122,21 +148,24 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -146,7 +175,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -156,6 +185,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapStringKey2.class,
"hitCount");
@@ -164,7 +194,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -173,12 +203,12 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -191,14 +221,15 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -210,7 +241,10 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -227,6 +261,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -244,6 +279,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -273,6 +309,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -305,8 +342,11 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -325,7 +365,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -355,6 +395,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -397,5 +438,7 @@ public class VersionedStatsRegionEntryHeapStringKey2 extends VersionedStatsRegio
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java
index f9d280e..ae66cb3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java
@@ -15,43 +15,70 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEntryHeap {
- public VersionedStatsRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VersionedStatsRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,10 +86,11 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -82,7 +110,7 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -93,21 +121,24 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -117,7 +148,7 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -127,13 +158,14 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -142,12 +174,12 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -160,14 +192,15 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -179,7 +212,10 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -196,6 +232,7 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -213,6 +250,7 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -242,6 +280,7 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -274,13 +313,16 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -293,5 +335,8 @@ public class VersionedStatsRegionEntryHeapUUIDKey extends VersionedStatsRegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java
index dc7124d..8e245d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java
@@ -15,46 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -63,6 +91,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +122,19 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +150,9 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +176,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,21 +187,24 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -174,7 +214,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -184,6 +224,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapIntKey.class,
"hitCount");
@@ -192,7 +233,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -201,12 +242,12 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -219,14 +260,15 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -238,7 +280,10 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -255,6 +300,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -272,6 +318,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -301,6 +348,7 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -333,12 +381,17 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -349,5 +402,8 @@ public class VersionedStatsRegionEntryOffHeapIntKey extends VersionedStatsRegion
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java
index 8acd7a7..9cafe9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java
@@ -15,46 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -63,6 +91,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +122,19 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +150,9 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +176,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,21 +187,24 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -174,7 +214,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -184,6 +224,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapLongKey.class,
"hitCount");
@@ -192,7 +233,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -201,12 +242,12 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -219,14 +260,15 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -238,7 +280,10 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -255,6 +300,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -272,6 +318,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -301,6 +348,7 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -333,12 +381,15 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -349,5 +400,8 @@ public class VersionedStatsRegionEntryOffHeapLongKey extends VersionedStatsRegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java
index c0c6705..a9fceeb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java
@@ -15,46 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -63,6 +91,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -94,13 +123,19 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -116,7 +151,9 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -140,7 +177,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -151,21 +188,24 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -175,7 +215,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -185,6 +225,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -193,7 +234,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -202,12 +243,12 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -220,14 +261,15 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -239,7 +281,10 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -256,6 +301,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -273,6 +319,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -302,6 +349,7 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -334,13 +382,19 @@ public class VersionedStatsRegionEntryOffHeapObjectKey extends VersionedStatsReg
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java
index 66e8b8b..0832fc1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java
@@ -15,42 +15,66 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -69,9 +93,11 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -80,6 +106,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -111,13 +138,19 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -133,7 +166,9 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -157,7 +192,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -168,21 +203,24 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -192,7 +230,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -202,6 +240,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -210,7 +249,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -219,12 +258,12 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -237,14 +276,15 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -256,7 +296,10 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -273,6 +316,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -290,6 +334,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -319,6 +364,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -351,8 +397,11 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -366,7 +415,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -385,6 +434,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -414,5 +464,8 @@ public class VersionedStatsRegionEntryOffHeapStringKey1 extends VersionedStatsRe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java
index af2e1a0..dbccb16 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java
@@ -15,42 +15,66 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -81,9 +105,11 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -92,6 +118,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -123,13 +150,19 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -145,7 +178,9 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -169,7 +204,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -180,21 +215,24 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -204,7 +242,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -214,6 +252,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -222,7 +261,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -231,12 +270,12 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -249,14 +288,15 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -268,7 +308,10 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -285,6 +328,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -302,6 +346,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -331,6 +376,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -363,8 +409,11 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -383,7 +432,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -413,6 +462,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -455,5 +505,7 @@ public class VersionedStatsRegionEntryOffHeapStringKey2 extends VersionedStatsRe
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java
index 6985727..f367421 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java
@@ -15,48 +15,75 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegionEntryOffHeap {
public VersionedStatsRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -65,6 +92,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -95,13 +123,19 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -117,7 +151,9 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -141,7 +177,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -152,21 +188,24 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -176,7 +215,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -186,6 +225,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryOffHeapUUIDKey.class,
"hitCount");
@@ -194,7 +234,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -203,12 +243,12 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -221,14 +261,15 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -240,7 +281,10 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -257,6 +301,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -274,6 +319,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -303,6 +349,7 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -335,13 +382,16 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -354,5 +404,8 @@ public class VersionedStatsRegionEntryOffHeapUUIDKey extends VersionedStatsRegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
index 405dac5..76fbcae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
@@ -15,46 +15,76 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -63,10 +93,11 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -86,7 +117,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -97,19 +128,22 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -126,7 +160,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -134,7 +168,9 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -159,7 +195,6 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -199,105 +234,110 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -314,6 +354,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -331,6 +372,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -360,6 +402,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -392,12 +435,17 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -408,5 +456,8 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[59/69] [abbrv] geode git commit: GEODE-1930: temporarily disable
verifySystemNotifications
Posted by ud...@apache.org.
GEODE-1930: temporarily disable verifySystemNotifications
* verifySystemNotifications is very flaky and we need to
determine what async state to Await for
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/88631957
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/88631957
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/88631957
Branch: refs/heads/feature/GEODE-2580
Commit: 88631957e9bc570115ed150eceed9a1b8b470a01
Parents: d16d192
Author: Kirk Lund <kl...@apache.org>
Authored: Thu May 18 14:57:26 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri May 19 14:17:39 2017 -0700
----------------------------------------------------------------------
.../org/apache/geode/management/RegionManagementDUnitTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/88631957/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
index 7dabd61..cb35663 100644
--- a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
@@ -258,7 +258,8 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
closeRegion(this.managerVM, REGION_PATH);
verifyDistributedMBean(this.managerVM, 0);
- verifySystemNotifications(this.managerVM, REGION_NAME, 3);
+ // TODO: GEODE-1930: next line is too flaky and needs to be fixed
+ // verifySystemNotifications(this.managerVM, REGION_NAME, 3);
}
@Test
[60/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
index dbdebea..5a81b6e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
@@ -65,7 +65,7 @@ public class LogWriterAppenderJUnitTest {
* when the configuration is changed the appender is still there.
*/
@Test
- public final void testAppenderToConfigHandling() throws IOException {
+ public void testAppenderToConfigHandling() throws IOException {
LogService.setBaseLogLevel(Level.TRACE);
final AppenderContext rootContext = LogService.getAppenderContext();
@@ -110,7 +110,7 @@ public class LogWriterAppenderJUnitTest {
* Verifies that writing to a Log4j logger will end up in the LogWriter's output.
*/
@Test
- public final void testLogOutput() throws IOException {
+ public void testLogOutput() throws IOException {
// Create the appender
final StringWriter stringWriter = new StringWriter();
final PureLogWriter logWriter =
@@ -178,7 +178,7 @@ public class LogWriterAppenderJUnitTest {
* Verifies that logging occurs at the levels set in the LogWriter
*/
@Test
- public final void testLogWriterLevels() throws IOException {
+ public void testLogWriterLevels() throws IOException {
final String loggerName = LogService.MAIN_LOGGER_NAME; // this.getClass().getName();
LogService.getLogger(); // Force logging to be initialized
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
new file mode 100644
index 0000000..84dc959
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.statistics;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class StatArchiveWriterTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ StatArchiveWriter mockStatArchiveWriter = mock(StatArchiveWriter.class);
+
+ when(mockStatArchiveWriter.bytesWritten()).thenReturn(1L);
+
+ mockStatArchiveWriter.close();
+
+ verify(mockStatArchiveWriter, times(1)).close();
+
+ assertThat(mockStatArchiveWriter.bytesWritten()).isEqualTo(1L);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
new file mode 100644
index 0000000..ca141b4
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.tcp;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+
+@Category(UnitTest.class)
+public class ConnectionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ Connection mockConnection = mock(Connection.class);
+ SocketChannel channel = null;
+ ByteBuffer buffer = null;
+ boolean forceAsync = true;
+ DistributionMessage mockDistributionMessage = mock(DistributionMessage.class);
+
+ mockConnection.nioWriteFully(channel, buffer, forceAsync, mockDistributionMessage);
+
+ verify(mockConnection, times(1)).nioWriteFully(channel, buffer, forceAsync,
+ mockDistributionMessage);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
new file mode 100644
index 0000000..2c23ddc
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import javax.management.openmbean.CompositeData;
+
+@Category(UnitTest.class)
+public class CompositeBuilderViaFromTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ CompositeBuilderViaFrom mockCompositeBuilderViaFrom = mock(CompositeBuilderViaFrom.class);
+ CompositeData compositeData = null;
+ String[] itemNames = new String[1];
+ OpenTypeConverter[] converters = new OpenTypeConverter[1];
+ Object result = new Object();
+
+ when(mockCompositeBuilderViaFrom.fromCompositeData(eq(compositeData), eq(itemNames),
+ eq(converters))).thenReturn(result);
+
+ assertThat(mockCompositeBuilderViaFrom.fromCompositeData(compositeData, itemNames, converters))
+ .isSameAs(result);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
new file mode 100644
index 0000000..8fea2b6
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import javax.management.openmbean.CompositeData;
+
+@Category(UnitTest.class)
+public class CompositeBuilderViaProxyTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ CompositeBuilderViaProxy mockCompositeBuilderViaProxy = mock(CompositeBuilderViaProxy.class);
+ CompositeData compositeData = null;
+ String[] itemNames = new String[1];
+ OpenTypeConverter[] converters = new OpenTypeConverter[1];
+ Object result = new Object();
+
+ when(mockCompositeBuilderViaProxy.fromCompositeData(eq(compositeData), eq(itemNames),
+ eq(converters))).thenReturn(result);
+
+ assertThat(mockCompositeBuilderViaProxy.fromCompositeData(compositeData, itemNames, converters))
+ .isSameAs(result);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
new file mode 100644
index 0000000..2dea75b
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class IdentityConverterTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ IdentityConverter mockIdentityConverter = mock(IdentityConverter.class);
+ Object value = new Object();
+ Object result = new Object();
+
+ when(mockIdentityConverter.toNonNullOpenValue(value)).thenReturn(result);
+ assertThat(mockIdentityConverter.toNonNullOpenValue(value)).isSameAs(result);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
index f624ab4..b582e52 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
@@ -197,7 +197,7 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
/**
* Destroy all of the components created for the default setup.
*/
- protected final void destroyDefaultSetup() {
+ protected void destroyDefaultSetup() {
if (this.shell != null) {
executeCommand(shell, "exit");
this.shell.terminate();
@@ -276,7 +276,7 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
*
* @return The default shell
*/
- protected synchronized final HeadlessGfsh getDefaultShell() {
+ protected synchronized HeadlessGfsh getDefaultShell() {
if (this.shell == null) {
this.shell = createShell();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 760d2c4..edec00a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -554,7 +554,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
});
}
- private final void deleteTestFiles() throws IOException {
+ private void deleteTestFiles() throws IOException {
this.managerConfigFile.delete();
this.managerPropsFile.delete();
this.vm1ConfigFile.delete();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
index 77a2453..0bfbefa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfoTest.java
@@ -17,8 +17,6 @@ package org.apache.geode.management.internal.cli.functions;
import static org.assertj.core.api.Assertions.*;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -30,18 +28,9 @@ import java.io.DataOutputStream;
@Category(UnitTest.class)
public class ExportedLogsSizeInfoTest {
- @Before
- public void setUp() throws Exception {
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
@Test
- public final void testExportedLogsSizeInfoConstructor() {
+ public void testExportedLogsSizeInfoConstructor() {
ExportedLogsSizeInfo sizeDetail = new ExportedLogsSizeInfo(1L, 11L, 111L);
assertThat(sizeDetail).isNotNull();
assertThat(sizeDetail.getLogsSize()).isEqualTo(1L);
@@ -50,7 +39,7 @@ public class ExportedLogsSizeInfoTest {
}
@Test
- public final void testExportedLogsSizeInfoZeroArgConstructor() {
+ public void testExportedLogsSizeInfoZeroArgConstructor() {
ExportedLogsSizeInfo sizeDetail = new ExportedLogsSizeInfo();
assertThat(sizeDetail).isNotNull();
assertThat(sizeDetail.getLogsSize()).isEqualTo(0L);
@@ -99,7 +88,7 @@ public class ExportedLogsSizeInfoTest {
}
@Test
- public final void testClassInequality() {
+ public void testClassInequality() {
ExportedLogsSizeInfo sizeDeatai1 = new ExportedLogsSizeInfo(7L, 77L, 777L);
String sizeDetail2 = sizeDeatai1.toString();
assertThat(sizeDeatai1.equals(sizeDetail2)).isFalse();
@@ -119,7 +108,6 @@ public class ExportedLogsSizeInfoTest {
assertThat(sizeDetail1.hashCode()).isEqualTo(29791);
assertThat(sizeDetail2.hashCode()).isEqualTo(41095);
assertThat(sizeDetail3.hashCode()).isEqualTo(115495);
-
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index ba436c5..0bd0ee9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.cli.functions;
import static org.junit.Assert.*;
@@ -63,6 +62,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class ShowMissingDiskStoresFunctionJUnitTest {
+
private GemFireCacheImpl cache;
private GemFireCacheImpl oldCacheInstance;
private InternalDistributedSystem system;
@@ -81,9 +81,6 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
@Rule
public ExpectedException expectedException = ExpectedException.none();
- /**
- * @throws java.lang.Exception
- */
@Before
public void setUp() throws Exception {
cache = Fakes.cache();
@@ -100,9 +97,6 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
memberManager = mock(PersistentMemberManager.class);
}
- /**
- * @throws java.lang.Exception
- */
@After
public void tearDown() throws Exception {
GemFireCacheImpl.setInstanceForTests(oldCacheInstance);
@@ -122,21 +116,14 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
}
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#getCache()}.
- */
@Test
- public final void testGetCache() {
+ public void testGetCache() {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
assertTrue(smdsFunc.getCache() instanceof Cache);
}
- /**
- * Test method for {@link ShowMissingDiskStoresFunction#execute(FunctionContext)}.
- */
@Test
- public final void testExecute() {
+ public void testExecute() {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
List<?> results = null;
@@ -152,12 +139,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
assertNotNull(results);
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- */
@Test
- public final void testExecuteWithNullContextThrowsRuntimeException() {
+ public void testExecuteWithNullContextThrowsRuntimeException() {
expectedException.expect(RuntimeException.class);
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
@@ -170,7 +153,7 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
* {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
*/
@Test
- public final void testExecuteWithNullCacheInstanceHasEmptyResults() throws Throwable {
+ public void testExecuteWithNullCacheInstanceHasEmptyResults() throws Throwable {
TestSMDSFFunc1 testSMDSFunc = new TestSMDSFFunc1();
List<?> results = null;
@@ -181,12 +164,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
assertNull(results.get(0));
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- */
@Test
- public final void testExecuteWithNullGFCIResultValueIsNull() throws Throwable {
+ public void testExecuteWithNullGFCIResultValueIsNull() throws Throwable {
TestSMDSFFunc2 testSMDSFunc = new TestSMDSFFunc2();
List<?> results = null;
@@ -200,12 +179,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
assertNull(results.get(0));
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- */
@Test
- public final void testExecuteWhenGFCIClosedResultValueIsNull() throws Throwable {
+ public void testExecuteWhenGFCIClosedResultValueIsNull() throws Throwable {
TestSMDSFFunc2 testSMDSFunc = new TestSMDSFFunc2();
List<?> results = null;
@@ -216,14 +191,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
assertNotNull(results);
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- *
- * @throws UnknownHostException
- */
@Test
- public final void testExecuteReturnsMissingDiskStores() throws Throwable {
+ public void testExecuteReturnsMissingDiskStores() throws Throwable {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
List<?> results = null;
@@ -261,12 +230,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
}
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- */
@Test
- public final void testExecuteReturnsMissingColocatedRegions() throws Throwable {
+ public void testExecuteReturnsMissingColocatedRegions() throws Throwable {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
List<?> results = null;
@@ -300,14 +265,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
}
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- *
- * @throws UnknownHostException
- */
@Test
- public final void testExecuteReturnsMissingStoresAndRegions() throws Throwable {
+ public void testExecuteReturnsMissingStoresAndRegions() throws Throwable {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
List<?> results = null;
@@ -372,14 +331,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
}
}
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#execute(org.apache.geode.cache.execute.FunctionContext)}.
- *
- * @throws Throwable
- */
@Test
- public final void testExecuteCatchesExceptions() throws Throwable {
+ public void testExecuteCatchesExceptions() throws Exception {
expectedException.expect(RuntimeException.class);
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
@@ -391,13 +344,8 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
fail("Failed to catch expected RuntimeException");
}
-
- /**
- * Test method for
- * {@link org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction#getId()}.
- */
@Test
- public final void testGetId() {
+ public void testGetId() {
ShowMissingDiskStoresFunction smdsFunc = new ShowMissingDiskStoresFunction();
assertEquals(ShowMissingDiskStoresFunction.class.getName(), smdsFunc.getId());
}
@@ -406,9 +354,9 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
private final List<Object> results = new LinkedList<Object>();
- private Throwable t;
+ private Exception t;
- protected List<Object> getResults() throws Throwable {
+ protected List<Object> getResults() throws Exception {
if (t != null) {
throw t;
}
@@ -427,7 +375,7 @@ public class ShowMissingDiskStoresFunctionJUnitTest {
@Override
public void sendException(final Throwable t) {
- this.t = t;
+ this.t = (Exception) t;
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
new file mode 100644
index 0000000..c894594
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal.cli.json;
+
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.Writer;
+
+@Category(UnitTest.class)
+public class TypedJsonTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ TypedJson mockTypedJson = mock(TypedJson.class);
+ Writer writer = null;
+ Object value = new Object();
+
+ mockTypedJson.writeVal(writer, value);
+
+ verify(mockTypedJson, times(1)).writeVal(writer, value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
index 2731b95..8ee3e0f 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
@@ -117,7 +117,7 @@ public class WanCommandsControllerJUnitTest {
.contains("--" + START_GATEWAYSENDER__ID + "=" + "");
}
- private static final Object[] getParametersWithGroupsAndMembers() {
+ private static Object[] getParametersWithGroupsAndMembers() {
return $(new Object[] {"sender1", new String[] {}, new String[] {}, false, false},
new Object[] {"sender2", new String[] {"group1"}, new String[] {}, true, false},
new Object[] {"sender3", new String[] {"group1", "group2"}, new String[] {}, true, false},
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/web/domain/LinkTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/domain/LinkTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/web/domain/LinkTest.java
new file mode 100644
index 0000000..ff98b7e
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/web/domain/LinkTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal.web.domain;
+
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.net.URI;
+
+import org.apache.geode.management.internal.web.http.HttpMethod;
+
+@Category(UnitTest.class)
+public class LinkTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ Link mockLink = mock(Link.class);
+ URI href = null;
+ HttpMethod method = HttpMethod.CONNECT;
+ String relation = "";
+
+ mockLink.setHref(href);
+ mockLink.setMethod(method);
+ mockLink.setRelation(relation);
+
+ verify(mockLink, times(1)).setHref(href);
+ verify(mockLink, times(1)).setMethod(method);
+ verify(mockLink, times(1)).setRelation(relation);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestTest.java
new file mode 100644
index 0000000..4a5a0d4
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/web/http/ClientHttpRequestTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal.web.http;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.management.internal.web.domain.Link;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ClientHttpRequestTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ClientHttpRequest mockClientHttpRequest = mock(ClientHttpRequest.class);
+ Link mockLink = mock(Link.class);
+
+ when(mockClientHttpRequest.getLink()).thenReturn(mockLink);
+
+ assertThat(mockClientHttpRequest.getLink()).isSameAs(mockLink);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
index 4e8a271..497f428 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
@@ -433,7 +433,7 @@ public class PdxSerializableDUnitTest extends JUnit4CacheTestCase {
* add a listener and writer that will throw an exception when invoked if events are for internal
* regions
*/
- public final void addPoisonedTransactionListeners() {
+ public void addPoisonedTransactionListeners() {
MyTestTransactionListener listener = new MyTestTransactionListener();
getCache().getCacheTransactionManager().addListener(listener);
getCache().getCacheTransactionManager().setWriter(listener);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
new file mode 100644
index 0000000..2644741
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.redis.internal.executor;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.regex.Pattern;
+
+@Category(UnitTest.class)
+public class AbstractScanExecutorTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractScanExecutor mockAbstractScanExecutor = mock(AbstractScanExecutor.class);
+ Pattern pattern = Pattern.compile(".");
+
+ when(mockAbstractScanExecutor.convertGlobToRegex(eq("pattern"))).thenReturn(pattern);
+
+ assertThat(mockAbstractScanExecutor.convertGlobToRegex("pattern")).isSameAs(pattern);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
index 244f4e5..9d3f721 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
@@ -102,7 +102,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
postSetUpClientAuthorizationTestBase();
}
- private final void setUpClientAuthorizationTestBase() throws Exception {
+ private void setUpClientAuthorizationTestBase() throws Exception {
server1 = getHost(0).getVM(0);
server2 = getHost(0).getVM(1);
client1 = getHost(0).getVM(2);
@@ -110,7 +110,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
setUpIgnoredExceptions();
}
- private final void setUpIgnoredExceptions() {
+ private void setUpIgnoredExceptions() {
Set<String> serverExceptions = new HashSet<>();
serverExceptions.addAll(Arrays.asList(serverIgnoredExceptions()));
if (serverExceptions.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
index 9a3ce86..1b09a83 100644
--- a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
@@ -155,7 +155,7 @@ public class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCa
}
}
- private final void setUpDeltas() {
+ private void setUpDeltas() {
for (int i = 0; i < 8; i++) {
deltas[i] = new DeltaTestImpl(0, "0", new Double(0), new byte[0], new TestObject1("0", 0));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
index 4cc8442..dc4ffac 100644
--- a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -130,7 +130,7 @@ public class DeltaClientPostAuthorizationDUnitTest extends ClientAuthorizationTe
}
@Override
- protected final void executeOpBlock(final List<OperationWithAction> opBlock, final int port1,
+ protected void executeOpBlock(final List<OperationWithAction> opBlock, final int port1,
final int port2, final String authInit, final Properties extraAuthProps,
final Properties extraAuthzProps, final TestCredentialGenerator credentialGenerator,
final Random random) throws InterruptedException {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
index 13d68b5..3a61bfc 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
@@ -373,7 +373,7 @@ public abstract class AuthzCredentialGenerator {
* @return the name of this class code.
*/
@Override
- public final String toString() {
+ public String toString() {
return this.name;
}
@@ -383,7 +383,7 @@ public abstract class AuthzCredentialGenerator {
* @return true if other object is same as this one.
*/
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
@@ -399,7 +399,7 @@ public abstract class AuthzCredentialGenerator {
*
* @return true if other {@code ClassCode} is same as this one.
*/
- public final boolean equals(final ClassCode opCode) {
+ public boolean equals(final ClassCode opCode) {
return opCode != null && opCode.ordinal == this.ordinal;
}
@@ -409,7 +409,7 @@ public abstract class AuthzCredentialGenerator {
* @return the ordinal of this {@code ClassCode}.
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
return this.ordinal;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
index 8695451..0ab4252 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
@@ -283,7 +283,7 @@ public abstract class CredentialGenerator {
* @return the name of this operation.
*/
@Override
- public final String toString() {
+ public String toString() {
return this.name;
}
@@ -293,7 +293,7 @@ public abstract class CredentialGenerator {
* @return true if other object is same as this one.
*/
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
@@ -309,7 +309,7 @@ public abstract class CredentialGenerator {
*
* @return true if other {@code ClassCode} is same as this one.
*/
- public final boolean equals(final ClassCode opCode) {
+ public boolean equals(final ClassCode opCode) {
return opCode != null && opCode.ordinal == this.ordinal;
}
@@ -319,7 +319,7 @@ public abstract class CredentialGenerator {
* @return the ordinal of this operation.
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
return this.ordinal;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java
index 42ccf38..45fb919 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java
@@ -35,7 +35,7 @@ public abstract class DUnitEnv {
public static DUnitEnv instance = null;
- public static final DUnitEnv get() {
+ public static DUnitEnv get() {
if (instance == null) {
try {
// for tests that are still being migrated to the open-source
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
index 5b8e615..72b8190 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
@@ -122,7 +122,7 @@ public class DistributedTestUtils {
}
}
- public final static Properties getAllDistributedSystemProperties(final Properties properties) {
+ public static Properties getAllDistributedSystemProperties(final Properties properties) {
Properties dsProperties = DUnitEnv.get().getDistributedSystemProperties();
// our tests do not expect auto-reconnect to be on by default
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
index 20fbb5b..a2ff978 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
@@ -135,7 +135,7 @@ public class Wait {
*
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
- public static final void pause(final int milliseconds) {
+ public static void pause(final int milliseconds) {
if (milliseconds >= 1000 || logger.isDebugEnabled()) { // check for debug but log at info
logger.info("Pausing for {} ms...", milliseconds);
}
@@ -211,7 +211,7 @@ public class Wait {
* @return the last time stamp observed
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
- public static final long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource) {
+ public static long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource) {
return waitForExpiryClockToChange(cacheTimeMillisSource,
cacheTimeMillisSource.cacheTimeMillis());
}
@@ -224,7 +224,7 @@ public class Wait {
* @return the last time stamp observed
* @deprecated Please use {@link org.awaitility.Awaitility} instead.
*/
- public static final long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource,
+ public static long waitForExpiryClockToChange(final LocalRegion cacheTimeMillisSource,
final long baseTime) {
long nowTime;
do {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 1d67dcd..4c7d7f2 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -44,7 +44,7 @@ public class OverridingGetPropertiesDisconnectsAllDUnitTest extends JUnit4Distri
}
@Override
- public final Properties getDistributedSystemProperties() {
+ public Properties getDistributedSystemProperties() {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
return props;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/golden/FailOutputTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailOutputTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailOutputTestCase.java
index 71040ef..ceb1586 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailOutputTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailOutputTestCase.java
@@ -20,7 +20,6 @@ import java.io.InputStreamReader;
/**
* Abstract test case for tests verifying that unexpected test output will cause expected failures.
- *
*/
public abstract class FailOutputTestCase extends GoldenTestCase implements ExecutableProcess {
@@ -38,7 +37,7 @@ public abstract class FailOutputTestCase extends GoldenTestCase implements Execu
abstract void outputProblemInProcess(String message);
@Override
- public final void executeInProcess() throws IOException {
+ public void executeInProcess() throws IOException {
outputLine("Begin " + name() + ".main");
outputLine("Press Enter to continue.");
new BufferedReader(new InputStreamReader(System.in)).readLine();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
index 2e9b8f9..e3374f4 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
@@ -68,7 +68,7 @@ public class PassJUnitTest extends GoldenTestCase implements ExecutableProcess {
}
@Override
- public final void executeInProcess() throws IOException {
+ public void executeInProcess() throws IOException {
outputLine("Begin " + name() + ".main");
outputLine("Press Enter to continue.");
new BufferedReader(new InputStreamReader(System.in)).readLine();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
index 2d60c27..e88a11d 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedProblemTestCase.java
@@ -74,7 +74,7 @@ public abstract class PassWithExpectedProblemTestCase extends GoldenTestCase
}
@Override
- public final void executeInProcess() throws IOException {
+ public void executeInProcess() throws IOException {
outputLine("Begin " + name() + ".main");
outputLine("Press Enter to continue.");
new BufferedReader(new InputStreamReader(System.in)).readLine();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
index e979f72..5e8bdac 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
@@ -225,7 +225,7 @@ public class CQListGIIDUnitTest extends JUnit4DistributedTestCase {
return Integer.valueOf(server1.getPort());
}
- public static final Region createRegion(String name, String rootName, RegionAttributes attrs)
+ public static Region createRegion(String name, String rootName, RegionAttributes attrs)
throws CacheException {
Region root = cache.getRegion(rootName);
if (root == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
index b80f5de..aa1b084 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
@@ -66,7 +66,7 @@ public abstract class LuceneDUnitTest extends JUnit4CacheTestCase {
RegionTestableType.PARTITION_PERSISTENT, RegionTestableType.FIXED_PARTITION};
}
- protected final Object[] parameterCombiner(Object[] aValues, Object[] bValues) {
+ protected Object[] parameterCombiner(Object[] aValues, Object[] bValues) {
Object[] parameters = new Object[aValues.length * bValues.length];
for (int i = 0; i < aValues.length; i++) {
for (int j = 0; j < bValues.length; j++) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
index a16646e..b83ca44 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
@@ -41,13 +41,13 @@ import static org.junit.Assert.*;
@RunWith(JUnitParamsRunner.class)
public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
- private final Object[] parametersForMultipleIndexCreates() {
+ private Object[] parametersForMultipleIndexCreates() {
Integer[] numIndexes = {1, 2, 10};
RegionTestableType[] regionTestTypes = getListOfRegionTestTypes();
return parameterCombiner(numIndexes, regionTestTypes);
}
- protected final Object[] parametersForIndexAndRegions() {
+ protected Object[] parametersForIndexAndRegions() {
Object[] indexCreations = new Object[] {getFieldsIndexWithOneField(),
getFieldsIndexWithTwoFields(), get2FieldsIndexes(), getAnalyzersIndexWithOneField(),
getAnalyzersIndexWithTwoFields(), getAnalyzersIndexWithNullField1()};
@@ -282,9 +282,7 @@ public class LuceneIndexCreationDUnitTest extends LuceneDUnitTest {
dataStore2.invoke(() -> verifyIndexList(0));
}
-
-
- protected final Object[] getXmlAndExceptionMessages() {
+ protected Object[] getXmlAndExceptionMessages() {
return $(
new Object[] {"verifyDifferentFieldsFails", CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS},
new Object[] {"verifyDifferentFieldAnalyzerSizesFails1",
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
index bed6f13..a8ab8d3 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
@@ -224,8 +224,7 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
LuceneTestUtilities.verifyInternalRegions(luceneService, cache, verify);
}
-
- private static final Object[] getRegionShortcuts() {
+ private static Object[] getRegionShortcuts() {
return $(new Object[] {PARTITION}, new Object[] {PARTITION_REDUNDANT},
new Object[] {PARTITION_PERSISTENT}, new Object[] {PARTITION_REDUNDANT_PERSISTENT},
new Object[] {PARTITION_OVERFLOW}, new Object[] {PARTITION_REDUNDANT_OVERFLOW},
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
index 67adfb9..a6252c8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
@@ -73,7 +73,7 @@ public class LuceneIndexDestroyDUnitTest extends LuceneDUnitTest {
accessor = Host.getHost(0).getVM(3);
}
- private final Object[] parametersForIndexDestroys() {
+ private Object[] parametersForIndexDestroys() {
String[] destroyDataRegionParameters = {"true", "false"};
RegionTestableType[] regionTestTypes = getListOfRegionTestTypes();
return parameterCombiner(destroyDataRegionParameters, regionTestTypes);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
index 4d72639..b378ca5 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
@@ -50,7 +50,7 @@ public class LuceneIndexCreationProfileJUnitTest {
assertEquals(profile.getFieldAnalyzers(), copy.getFieldAnalyzers());
}
- private final Object[] getSerializationProfiles() {
+ private Object[] getSerializationProfiles() {
return $(new Object[] {getOneFieldLuceneIndexCreationProfile()},
new Object[] {getTwoFieldLuceneIndexCreationProfile()},
new Object[] {getTwoAnalyzersLuceneIndexCreationProfile()},
@@ -64,7 +64,7 @@ public class LuceneIndexCreationProfileJUnitTest {
assertEquals(expectedResult, otherProfile.checkCompatibility("/" + REGION_NAME, myProfile));
}
- private final Object[] getCheckCompatibilityProfiles() {
+ private Object[] getCheckCompatibilityProfiles() {
return $(
new Object[] {getOneFieldLuceneIndexCreationProfile(),
getTwoFieldLuceneIndexCreationProfile(), CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS},
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
----------------------------------------------------------------------
diff --git a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
index d19d900..de8825b 100644
--- a/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
+++ b/geode-old-client-support/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package com.gemstone.gemfire.cache.execute;
import java.util.ArrayList;
@@ -36,12 +35,9 @@ import org.apache.geode.cache.execute.FunctionService;
* This allows for separation of business and error handling logic, as client code that processes
* function execution results does not have to deal with errors; errors can be dealt with in the
* exception handling logic, by catching this exception.
- *
* <p>
* The exception string provides details on the cause of failure.
- * </p>
- *
- *
+ *
* @since GemFire 6.0
* @see FunctionService
* @deprecated please use the org.apache.geode version of this class
@@ -96,7 +92,7 @@ public class FunctionException extends GemFireException {
* @param cause
* @since GemFire 6.5
*/
- public final void addException(Throwable cause) {
+ public void addException(Throwable cause) {
Assert.assertTrue(cause != null, "unexpected null exception to add to FunctionException");
getExceptions().add(cause);
}
@@ -106,7 +102,7 @@ public class FunctionException extends GemFireException {
*
* @since GemFire 6.5
*/
- public final List<Throwable> getExceptions() {
+ public List<Throwable> getExceptions() {
if (this.exceptions == null) {
this.exceptions = new ArrayList<Throwable>();
}
@@ -118,7 +114,7 @@ public class FunctionException extends GemFireException {
*
* @since GemFire 6.5
*/
- public final void addExceptions(Collection<? extends Throwable> ex) {
+ public void addExceptions(Collection<? extends Throwable> ex) {
getExceptions().addAll(ex);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
----------------------------------------------------------------------
diff --git a/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java b/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
new file mode 100644
index 0000000..5104466
--- /dev/null
+++ b/geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.gemstone.gemfire.cache.execute;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Category(UnitTest.class)
+public class FunctionExceptionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ FunctionException mockFunctionException = mock(FunctionException.class);
+ Throwable cause = new Exception("message");
+ List<Throwable> listOfThrowables = new ArrayList<>();
+ Collection<? extends Throwable> collectionOfThrowables = new ArrayList<>();
+
+ when(mockFunctionException.getExceptions()).thenReturn(listOfThrowables);
+
+ mockFunctionException.addException(cause);
+ mockFunctionException.addExceptions(collectionOfThrowables);
+
+ verify(mockFunctionException, times(1)).addException(cause);
+ verify(mockFunctionException, times(1)).addExceptions(collectionOfThrowables);
+
+ assertThat(mockFunctionException.getExceptions()).isSameAs(listOfThrowables);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index f101027..8aa88b2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -3768,7 +3768,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
}
@Override
- public final Properties getDistributedSystemProperties() {
+ public Properties getDistributedSystemProperties() {
// For now all WANTestBase tests allocate off-heap memory even though
// many of them never use it.
// The problem is that WANTestBase has static methods that create instances
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
index ea9237e..03dc0ad 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/support/RegionData.java
@@ -15,45 +15,31 @@
package org.apache.geode.rest.internal.web.controllers.support;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializable;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import org.apache.geode.cache.query.Struct;
-import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.geode.rest.internal.web.util.JsonWriter;
-
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
/**
* The RegionData class is a container for data fetched from a GemFire Cache Region.
- * <p/>
- *
+ *
* @see com.fasterxml.jackson.databind.JsonSerializable
* @see java.lang.Iterable
* @since GemFire 8.0
*/
-
@SuppressWarnings("unused")
@XmlRootElement(name = "region")
@XmlType(name = "org.gopivotal.app.web.controllers.support.RegionData")
@@ -75,18 +61,13 @@ public class RegionData<T> implements Iterable<T>, JsonSerializable {
return regionNamePath;
}
- public final void setRegionNamePath(final String regionNamePath) {
+ public void setRegionNamePath(final String regionNamePath) {
Assert.hasText(regionNamePath, "The name or path of the Region must be specified!");
this.regionNamePath = regionNamePath;
}
public RegionData<T> add(final T data) {
- // We are adding null data into the response
- // Assert.notNull(data, String.format("The data to add to Region (%1$s) cannot be null!",
- // getRegionNamePath()));
- // if(data != null) {
this.data.add(data);
- // }
return this;
}
@@ -102,10 +83,6 @@ public class RegionData<T> implements Iterable<T>, JsonSerializable {
public RegionData<T> add(final Iterable<T> data) {
for (final T element : data) {
- // Adding null data into the response
- /*
- * if (element != null) { add(element); }
- */
add(element);
}
@@ -139,19 +116,15 @@ public class RegionData<T> implements Iterable<T>, JsonSerializable {
public void serialize(final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider) throws IOException {
- // if(this!=null && this.size() > 1) {
jsonGenerator.writeStartObject();
jsonGenerator.writeArrayFieldStart(getRegionNamePath());
- // }
for (T element : this) {
JsonWriter.writeValueAsJson(jsonGenerator, element, null);
}
- // if(this!=null && this.size() > 1) {
jsonGenerator.writeEndArray();
jsonGenerator.writeEndObject();
- // }
}
public void serializeWithType(final JsonGenerator jsonGenerator,
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
new file mode 100644
index 0000000..5f32d13
--- /dev/null
+++ b/geode-web-api/src/test/java/org/apache/geode/rest/internal/web/controllers/support/RegionDataTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.rest.internal.web.controllers.support;
+
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RegionDataTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RegionData mockRegionData = mock(RegionData.class);
+ String regionNamePath = "regionNamePath";
+
+ mockRegionData.setRegionNamePath(regionNamePath);
+
+ verify(mockRegionData, times(1)).setRegionNamePath(regionNamePath);
+ }
+}
[35/69] [abbrv] geode git commit: GEODE-2915 Messages rejected due to
unknown "vmkind"
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 01b16a3..f2baa50 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1,289 +1,289 @@
org/apache/geode/admin/RegionSubRegionSnapshot,2
fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1
toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1
-
+
org/apache/geode/admin/internal/FinishBackupRequest,2
fromData,33,2a2bb700292a2bb8002ab500022a2bb8002ab500032a2bb8002bb6002cb50004b1
toData,33,2a2bb7002d2ab400022bb8002e2ab400032bb8002e2ab40004b8002f2bb80030b1
-
+
org/apache/geode/admin/internal/FinishBackupResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/admin/internal/PrepareBackupResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2
fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1
toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1
-
+
org/apache/geode/admin/jmx/internal/StatAlertNotification,2
fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1
toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1
-
+
org/apache/geode/cache/ExpirationAttributes,2
fromData,22,2a2bb900120100b500022a2bb80013c00014b50004b1
toData,19,2b2ab40002b9001502002ab400042bb80016b1
-
+
org/apache/geode/cache/MembershipAttributes,2
fromData,39,2a2a2bb80032b7000bb500032a2bb900330100b80034b500052a2bb900330100b80035b50007b1
toData,89,2ab40003b9002c0100bd002d4d2ab40003b9002101004e03360415042cbea2001b2c15042db900240100c00025b90026010053840401a7ffe42c2bb8002e2b2ab40005b4002fb9003002002b2ab40007b40031b900300200b1
-
+
org/apache/geode/cache/SubscriptionAttributes,2
fromData,14,2a2bb9000f0100b80010b50003b1
toData,14,2b2ab40003b4000db9000e0200b1
-
+
org/apache/geode/cache/client/internal/CacheServerLoadMessage,2
fromData,52,2a2bb7000d2abb000e59b7000fb500022ab400022bb800102abb001159b70012b500032ab400032bb800102a2bb80013b50004b1
toData,30,2a2bb700142ab400022bb800152ab400032bb800152ab400042bb80016b1
-
+
org/apache/geode/cache/client/internal/locator/ClientConnectionRequest,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/cache/client/internal/locator/ClientConnectionResponse,2
fromData,35,2a2bb80004b500022ab400029900162abb000559b70006b500032ab400032bb60007b1
toData,31,2ab40003c6000704a70004033d1c2bb800081c99000b2ab400032bb60009b1
-
+
org/apache/geode/cache/client/internal/locator/ClientReplacementRequest,2
fromData,25,2a2bb700042abb000559b70006b500032ab400032bb80007b1
toData,14,2a2bb700082ab400032bb80009b1
-
+
org/apache/geode/cache/client/internal/locator/GetAllServersRequest,2
fromData,6,2a2bb70003b1
toData,6,2a2bb70004b1
-
+
org/apache/geode/cache/client/internal/locator/GetAllServersResponse,2
fromData,31,2a2bb80005b500032ab40003c600122ab40003b600049a00082a04b50002b1
toData,9,2ab400032bb80006b1
-
+
org/apache/geode/cache/client/internal/locator/LocatorListResponse,2
fromData,43,2a2bb80006b500032a2bb900070100b500052ab40003c600142ab40003b9000401009a00082a04b50002b1
toData,19,2ab400032bb800082b2ab40005b900090200b1
-
+
org/apache/geode/cache/client/internal/locator/LocatorStatusResponse,2
fromData,56,2a2bb6001f2a2bb600202a2bb600212a2bb600222a2bb600232a2bb600242a2bb600252a2bb600262a2bb600272a2bb600282a2bb60029b1
toData,56,2a2bb600322a2bb600332a2bb600342a2bb600352a2bb600362a2bb600372a2bb600382a2bb600392a2bb6003a2a2bb6003b2a2bb6003cb1
-
+
org/apache/geode/cache/client/internal/locator/QueueConnectionRequest,2
fromData,40,2a2bb700072a2bb80008b500042a2bb80009b500062a2bb8000ab500052a2bb9000b0100b50002b1
toData,40,2a2bb7000c2ab400042bb8000d2ab400062bb8000e2ab400052bb8000f2b2ab40002b900100200b1
-
+
org/apache/geode/cache/client/internal/locator/QueueConnectionResponse,2
fromData,41,2a2bb80006b500032a2bb80007b500042ab40004c600142ab40004b9000501009a00082a04b50002b1
toData,17,2ab400032bb800082ab400042bb80009b1
-
+
org/apache/geode/cache/client/internal/locator/ServerLocationRequest,2
fromData,9,2a2bb80003b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/cache/query/internal/CqEntry,2
fromData,17,2a2bb80009b500022a2bb80009b50003b1
toData,17,2ab400022bb8000b2ab400032bb8000bb1
-
+
org/apache/geode/cache/query/internal/CumulativeNonDistinctResults,2
fromData,126,2bb8001dc0001e4d2abb00035912042cb70005b500012cb9001f01003e2bb90020010037042abb001a59160488b70021b5000816043706160609949e00421d9900232bb800223a082ab40008bb0023592cc000241908b70025b90026020057a700152bb8001d3a082ab400081908b9002602005716060a653706a7ffbdb1
toData,125,2ab40001b900280100b9001f01003d2ab40001b9002801002bb80029bb002a5911040001b7002b4e2db6002c3a042ab600143a050336061905b9001501009900311905b9001601003a071c9900181907c0002db9002e01003a0819082bb8002fa7000919072db80029840601a7ffcb1904150685b600302d2bb60031b1
-
+
org/apache/geode/cache/query/internal/LinkedResultSet,2
fromData,40,2bb9001501003d2a2bb80016c00017b500071c3e1d9e00122a2bb80016b60018578403ffa7fff0b1
toData,46,2b2ab60019b9001a02002ab400072bb8001b2ab6001c4d2cb9001d01009900102cb9001e01002bb8001ba7ffedb1
-
+
org/apache/geode/cache/query/internal/LinkedStructSet,2
fromData,68,2a2bb900300100b500022bb9003101003d2a2bb80032c00020b500071c3e1d9e00242bb80032c000333a042abb000c592ab400071904b70034b60035578403ffa7ffdeb1
toData,66,2b2ab40002b9003702002b2ab60038b9003902002ab400072bb8003a2ab600284d2cb90029010099001a2cb9002a0100c000124e2db9003b01002bb8003aa7ffe3b1
-
+
org/apache/geode/cache/query/internal/NWayMergeResults,2
fromData,134,2bb8001ec0001f4d2abb00045912202cb70006b500022cb9002101003e2a2bb80022b500012bb90023010037042abb001b59160488b70024b5000916043706160609949e00421d9900232bb800253a082ab40009bb0026592cc000271908b70028b90029020057a700152bb8001e3a082ab400091908b9002902005716060a653706a7ffbdb1
toData,133,2ab40002b9002b0100b9002101003d2ab40002b9002b01002bb8002c2ab400012bb8002dbb002e5911040001b7002f4e2db600303a042ab600153a050336061905b9001601009900311905b9001701003a071c9900181907c00031b9003201003a0819082bb80033a7000919072db8002c840601a7ffcb1904150685b600342d2bb60035b1
-
+
org/apache/geode/cache/query/internal/NullToken,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/cache/query/internal/PRQueryTraceInfo,2
fromData,29,2a2bb900090100b500042a2bb9000a0100b500062a2bb8000bb50003b1
toData,29,2b2ab40004b9000502002b2ab40006b9000702002ab400032bb80008b1
-
+
org/apache/geode/cache/query/internal/ResultsBag,2
fromData,106,2a2bb80018c00019b5001a2a2bb9001b0100b50017b2001c9a00162ab400179c000fbb001d592ab40017b7001ebf2a2ab6001fb500042a2bb600202ab400172ab40021643d1c9e00232bb800184e2bb9001b010036042ab400042d1504b60022571c1504643da7ffdfb1
toData,116,2ab4001a2bb800242b2ab60025b9002602002a2bb600272ab600252ab40021643d2ab40004b60028b9002901004e2db9000a010099003f1c9e003b2db9000b0100c0002a3a041904b6002b3a0519052bb800241904b6002c36061c1506a200061c36062b1506b9002602001c1506643da7ffbeb1
-
+
org/apache/geode/cache/query/internal/ResultsCollectionWrapper,2
fromData,55,2bb9005801003d1c99000e2a2bb80059b50002a7000e2a2bb8005ac0005bb500022a2bb8005ac0005cb5000d2a2bb900580100b50004b1
toData,60,2ab40002c100543d2b1cb9005502001c9900112ab40002c0004e2bb80056a7000b2ab400022bb800572ab4000d2bb800572b2ab40004b900550200b1
-
+
org/apache/geode/cache/query/internal/ResultsSet,2
fromData,49,2bb9001801003dbb001959b7001a4e2d2bb8001b2a2db600051c360415049e00122a2bb8001cb6001d578404ffa7ffefb1
toData,70,2b2ab6001eb9001f02002ab60020b900040100c000194d2cc6000704a70004031221b800222c2bb800232ab600244e2db9002501009900102db9002601002bb80027a7ffedb1
-
+
org/apache/geode/cache/query/internal/SortedResultSet,2
fromData,40,2bb9001601003d2a2bb80017c00018b500081c3e1d9e00122a2bb80017b60019578403ffa7fff0b1
toData,46,2b2ab6001ab9001b02002ab400082bb8001c2ab6001d4d2cb9001e01009900102cb9001f01002bb8001ca7ffedb1
-
+
org/apache/geode/cache/query/internal/SortedStructSet,2
fromData,57,2a2bb900440100b500022bb9004501003d2a2bb80046c00034b500091c3e1d9e00192bb80046c000283a042a1904b60013578403ffa7ffe9b1
toData,64,2b2ab40002b9004702002b2ab6002bb9004802002ab400092bb800492ab6002c4d2cb9002601009900182cb900270100c00028c000284e2d2bb8004aa7ffe5b1
-
+
org/apache/geode/cache/query/internal/StructBag,2
fromData,16,2a2bb700482a2bb900490100b50002b1
toData,16,2a2bb7004a2b2ab40002b9004b0200b1
-
+
org/apache/geode/cache/query/internal/StructImpl,2
fromData,72,2a2bb80026c00027b500072a2bb80028b500082ab40008c600302ab400084d2cbe3e03360415041da2001f2c1504323a051905c1000999000b2a04b50002a70009840401a7ffe1b1
toData,17,2ab400072bb800292ab400082bb8002ab1
-
+
org/apache/geode/cache/query/internal/StructSet,2
fromData,58,2abb000359bb000459b70005b70006b500072bb9005101003d2a2bb80052c00041b5000c1c3e1d9e00122a2bb80052b60031578403ffa7fff0b1
toData,46,2b2ab6003ab9005302002ab4000c2bb800542ab6004a4d2cb9001201009900102cb9001301002bb80054a7ffedb1
-
+
org/apache/geode/cache/query/internal/Undefined,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/cache/query/internal/index/IndexCreationData,2
fromData,106,2a2bb9000f0100b500022a2bb9000f0100b500052a2bb9000f0100b500042a2bb900100100b500082bb9001101003d031ca0000d2ab2000cb50003a70019041ca0000d2ab2000eb50003a7000a2ab20012b500032bb9001001003e1d99000d2a2bb9000f0100b50006b1
toData,122,2b2ab40002b9000a02002b2ab40005b9000a02002b2ab40004b9000a02002b2ab40008b9000b0200b2000c2ab40003a6000d2b03b9000d0200a7001eb2000e2ab40003a6000d2b04b9000d0200a7000a2b05b9000d02002ab40006c600172b04b9000b02002b2ab40006b9000a0200a7000a2b03b9000b0200b1
-
+
org/apache/geode/cache/query/internal/types/CollectionTypeImpl,2
fromData,17,2a2bb700232a2bb80024c00025b50003b1
toData,14,2a2bb700262ab400032bb80027b1
-
+
org/apache/geode/cache/query/internal/types/MapTypeImpl,2
fromData,17,2a2bb7001c2a2bb8001dc00015b50003b1
toData,14,2a2bb7001e2ab400032bb8001fb1
-
+
org/apache/geode/cache/query/internal/types/ObjectTypeImpl,2
fromData,9,2a2bb8000ab50002b1
toData,9,2ab400022bb8000bb1
-
+
org/apache/geode/cache/query/internal/types/StructTypeImpl,2
fromData,28,2a2bb700292a2bb8002ab5000b2a2bb8002bc0002cc0002cb5000db1
toData,22,2a2bb7002d2ab4000b2bb8002e2ab4000d2bb8002fb1
-
+
org/apache/geode/cache/server/ServerLoad,2
fromData,41,2a2bb900070100b500022a2bb900070100b500042a2bb900070100b500032a2bb900070100b50005b1
toData,41,2b2ab40002b9000602002b2ab40004b9000602002b2ab40003b9000602002b2ab40005b900060200b1
-
+
org/apache/geode/cache/server/internal/ConnectionCountProbe,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/DistributionAdvisor$Profile,2
fromData,40,2abb001259b70013b500082ab400082bb800142a2bb900150100b500092a2bb900150100b50003b1
toData,29,2ab400082bb800102b2ab40009b9001102002b2ab40003b900110200b1
-
+
org/apache/geode/distributed/internal/DistributionMessage,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/HighPriorityAckedMessage,2
fromData,51,2a2bb700442a2bb900450100b500122ab800462bb90045010032b500092a2bb900470100b5000a2a2bb80048c00049b50007b1
toData,47,2a2bb700402b2ab40012b9004102002b2ab40009b60024b9004102002b2ab4000ab9004202002ab400072bb80043b1
-
+
org/apache/geode/distributed/internal/ReplyMessage,2
fromData,101,2a2bb7003d2bb9003e01003d2a1c05b8003fb500022a1c1008b8003fb500031c04b8003f99000d2a2bb900400100b500041c07b8003f9900132a2bb80041b500062a04b50007a700141c1040b8003f99000b2a2bb80041b500062a1c1080b8003fb50039b1
toData,132,2a2bb70038033d2ab400029900081c0580913d2ab4000799000b1c0780913da700102ab40006c600091c104080913d2ab400049900081c0480913d2ab400039900091c100880913d2ab400399900091c108080913d2b1cb9003a02002ab4000499000d2b2ab40004b9003b02002ab400079a000a2ab40006c6000b2ab400062bb8003cb1
-
+
org/apache/geode/distributed/internal/SerialAckedMessage,2
fromData,27,2a2bb7002c2a2bb9002d0100b500172a2bb8002ec0001fb50007b1
toData,24,2a2bb700292b2ab40017b9002a02002ab400072bb8002bb1
-
+
org/apache/geode/distributed/internal/ServerLocation,2
fromData,19,2a2bb8000bb500092a2bb9000c0100b5000ab1
toData,19,2ab400092bb8000d2b2ab4000ab9000e0200b1
-
+
org/apache/geode/distributed/internal/ShutdownMessage,2
fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1
toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1
-
+
org/apache/geode/distributed/internal/StartupMessage,3
fromDataProblem,38,2ab40037c7000e2abb006559b70066b500372ab400372bb60067572ab400371268b6006757b1
fromData,293,2a2bb700692a2bb8006ab500092a2bb9006b0100b5000c2a2bb9006c0100b5000d2a2bb9006c0100b500112bb9006b01003d033e1d1ca2003e2bb8006d3a042bb9006b010036051904c6000d19040301011505b8006ea700183a062ab2006f04bd00205903190653b60024b70070840301a7ffc32bb9006b01003e03360415041da200492bb8006d3a052bb8006d3a062bb9006b010036071905c600121906c6000d19051906150703b80071a700183a082ab2007204bd00205903190853b60024b70070840401a7ffb72a2bb80073c00074b500122a2bb9006b0100b500172a2bb8006ab500182a2bb9006c0100b50019bb005e59b7005f3a0419042bb600752a1904b60076b5000a2a1904b60077b5000b2a1904b60078b5000e2a1904b60079b5000fb1
toData,318,2a2bb7004b2ab400092bb8004c2b2ab4000cb9004d02002b2ab4000db9004e02002b2ab40011b9004e0200b8004f4d2b2cbeb9004d0200033e1d2cbea2001f2c1d32b600502bb800512b2c1d32b60052b9004d0200840301a7ffe1b800534e2b2dbeb9004d020003360415042dbea200782d150432c100549900302d150432c00054b60055b600563a052d150432c00054b60057b600563a062d150432c00054b600583607a700272d150432c00059b6005a3a052d150432c00059b6005b3a062d150432c00059b6005c360719052bb8005119062bb800512b1507b9004d0200840401a7ff872ab400122bb8005d2b2ab40017b9004d02002ab400182bb8004c2b2ab40019b9004e0200bb005e59b7005f3a0419042ab4000ab6006019042ab4000bb6006119042ab4000eb6006219042ab4000fb6006319042bb60064b1
-
+
org/apache/geode/distributed/internal/StartupResponseMessage,3
fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1
fromData,220,2a2bb700442a2bb900450100b500202a2bb80046b500092a2bb900470100b5000a2bb9004501003d2a1cbd0013b500032a1cbc0ab50002033e1d1ca200332ab400031d2bb80048532ab400021d2bb9004501004fa700143a042ab400021d2bb9004501004f1904bf840301a7ffce2bb9004501003e2a1dbd0013b500042a1dbd0013b500052a1dbc0ab5000603360415041da2002c2ab4000415042bb80048532ab4000515042bb80048532ab4000615042bb9004501004f840401a7ffd42a2bb80049c0004ab5000c2a2bb900450100b5000e2a2bb80046b50011b1
toData,170,2a2bb7003e2b2ab40020b9003f02002ab400092bb800402b2ab4000ab9004102002b2ab40002beb9003f0200033d1c2ab40002bea2001f2ab400031c322bb800422b2ab400021c2eb9003f0200840201a7ffde2b2ab40006beb9003f0200033d1c2ab40006bea200292ab400041c322bb800422ab400051c322bb800422b2ab400061c2eb9003f0200840201a7ffd42ab4000c2bb800432b2ab4000eb9003f02002ab400112bb80040b1
-
+
org/apache/geode/distributed/internal/StartupResponseWithVersionMessage,2
fromData,43,2a2bb7001f2a2bb80020b50004bb001a59b7001b4d2c2bb600212a2cb60022b500062a2cb60023b50009b1
toData,43,2a2bb700182ab400042bb80019bb001a59b7001b4d2c2ab40006b6001c2c2ab40009b6001d2c2bb6001eb1
-
+
org/apache/geode/distributed/internal/WaitForViewInstallation,2
fromData,26,2a2bb7001c2a2bb9001d0100b500162a2bb9001e0100b50017b1
toData,26,2a2bb700192b2ab40016b9001a03002b2ab40017b9001b0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryMessage,2
fromData,42,2a2bb700472a2bb80048b500032a2bb80049b500432a2bb9004a0100b500322a2bb9004b0100b50002b1
toData,42,2a2bb700412ab400032bb800422ab400432bb800442b2ab40032b9004502002b2ab40002b900460200b1
-
+
org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryReplyMessage,2
fromData,74,2a2bb700092a2bb9000a0100b500032ab4000304a000352bb8000bc0000c4d2cc600152abb000d592c2bb9000a0100b7000eb500042a2bb9000a0100b500062a2bb9000f0100b50007b1
toData,83,2a2bb700102b2ab40003b9001102002ab4000304a0003e2ab40004c7000b012bb80012a7001b2ab40004b600052bb800122b2ab40004b60013b9001102002b2ab40006b9001102002b2ab40007b900140300b1
-
+
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorMessage,2
fromData,55,2a2bb700122a2bb80013b500022a2bb900140100b500032a2bb900140100b500052a2bb900150100b500042a2bb80016c00017b50006b1
toData,52,2a2bb700182ab400022bb800192b2ab40003b9001a02002b2ab40005b9001a02002b2ab40004b9001b03002ab400062bb8001cb1
-
+
org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorReplyMessage,2
fromData,30,2a2bb700052a2bb900060100b500022a2bb80007c00008c00008b50003b1
toData,24,2a2bb700092b2ab40002b9000a02002ab400032bb8000bb1
-
+
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseMessage,2
fromData,52,2a2bb7004e2a2bb8004fb500032a2bb80050b5002b2a2bb900510100b5002a2a2bb900520100b500022a2bb900520100b50041b1
toData,52,2a2bb700492ab400032bb8004a2ab4002b2bb8004b2b2ab4002ab9004c02002b2ab40002b9004d02002b2ab40041b9004d0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseReplyMessage,2
fromData,24,2a2bb700052a2bb80006b500072a2bb900080100b50003b1
toData,24,2a2bb700092ab400072bb8000a2b2ab40003b9000b0200b1
-
+
org/apache/geode/distributed/internal/locks/DLockRemoteToken,2
fromData,10,bb000e59120fb70010bf
toData,53,2ab400112bb800252ab40012b600152bb800252b2ab40012b60026b9002702002b2ab40013b9002702002b2ab40014b900280300b1
-
+
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockRequestMessage,2
fromData,134,2a2bb700a62a2bb900a70100b500242a2bb800a8b500102a2bb900a90100b500112a2bb900a90100b500122a2bb900a90100b500132a2bb900aa0100b500552a2bb900aa0100b5000e2a2bb900ab0100b5000f2a2bb900ab0100b500142a2bb900ab0100b500152a2bb900a90100b500162a2bb900ab0100b500172a2bb900ab0100b5006cb1
toData,134,2a2bb700a02b2ab40024b900a102002ab400102bb800a22b2ab40011b900a303002b2ab40012b900a303002b2ab40013b900a303002b2ab40055b900a402002b2ab4000eb900a402002b2ab4000fb900a502002b2ab40014b900a502002b2ab40015b900a502002b2ab40016b900a303002b2ab40017b900a502002b2ab4006cb900a50200b1
-
+
org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockResponseMessage,2
fromData,72,2a2bb700442a2bb900450100b500032a2bb900460100b500112a2bb80047b500122a2bb900480100b5003f2a2bb80047b500412a2bb900490100b500132a2bb900490100b50043b1
toData,72,2a2bb7003b2b2ab40003b9003c02002b2ab40011b9003d02002ab400122bb8003e2b2ab4003fb9004003002ab400412bb8003e2b2ab40013b9004202002b2ab40043b900420200b1
-
+
org/apache/geode/distributed/internal/locks/DLockService$SuspendLockingToken,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor$DeposeGrantorMessage,2
fromData,55,2a2bb700162a2bb900170100b500092a2bb80018b500042a2bb80019c0001ab500052a2bb9001b0100b500062a2bb900170100b50007b1
toData,52,2a2bb7001c2b2ab40009b9001d02002ab400042bb8001e2ab400052bb8001f2b2ab40006b9002003002b2ab40007b9001d0200b1
-
+
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitMessage,2
fromData,16,2a2bb7001d2a2bb9001e0100b50005b1
toData,16,2a2bb7001f2b2ab40005b900200200b1
-
+
org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitReplyMessage,2
fromData,38,2a2bb7000e2a2bb8000fb500042a2bb8000fb500052a2bb8000fb500062a2bb8000fb50007b1
toData,38,2a2bb700102ab400042bb800112ab400052bb800112ab400062bb800112ab400072bb80011b1
-
+
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorInfoReplyMessage,2
fromData,47,2a2bb700142a2bb80015c00016b500052a2bb900170100b500092a2bb900180100b5000b2a2bb900190100b50007b1
toData,44,2a2bb7001a2ab400052bb8001b2b2ab40009b9001c03002b2ab4000bb9001d02002b2ab40007b9001e0200b1
-
+
org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorRequestMessage,2
fromData,73,2a2bb700292a2bb9002a0100b500052a2bb9002b0100b500062a2bb8002cb500072a2bb9002b0100b5000b2a2bb9002d0100b500092ab4000904a0000e2a2bb8002ec0002fb50008b1
toData,70,2a2bb700302b2ab40005b9003103002b2ab40006b9003202002ab400072bb800332b2ab4000bb9003202002b2ab40009b9003402002ab4000904a0000b2ab400082bb80035b1
-
+
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedMessage,2
fromData,24,2a2bb700282a2bb900290100b500082a2bb8002ab50006b1
toData,24,2a2bb7002b2b2ab40008b9002c02002ab400062bb8002db1
-
+
org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedReplyMessage,2
fromData,16,2a2bb700172a2bb900180100b50008b1
toData,16,2a2bb700192b2ab40008b9001a0200b1
-
+
org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
fromData,38,2a2bb6009f2ab6009ab900190100b20095b60078a100112ab400012bb900960200a700044db1
fromDataPre_GFE_7_1_0_0,282,2bb800a04d2bb900a101003e2a2bb8008fb500072ab2000499000e2c2ab40007b800a2a700072cb60008b500072bb900a3010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2bb900a1010036072bb900a1010036082bb900a3010036092bb800913a0a02360b2bb8008f3a0c1509100da0000e2a2bb8008fb50014a700152bb8008f3a0d190dc6000a190db800a4360b2bb8008f3a0d2bb80092b60093360e190db600779e0011bb004f59190d150eb70050a70004013a0f2a15042bb700943610bb003159150715081509150b190c190a190fb700323a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b80047b1
@@ -291,1848 +291,1848 @@ fromDataPre_GFE_9_0_0_0,282,2bb800a04d2bb900a101003e2a2bb8008fb500072ab200049900
toData,34,2a2bb600992ab40001b900190100b20095b60078a1000d2ab6009a2bb9008b0200b1
toDataPre_GFE_7_1_0_0,271,2ab40001b9003e01009e000704a7000403b800472ab600592bb8009b2b2ab60058b9009c02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009d02002b2ab40001b9003d0100b9009c02002b2ab40001b9004b0100b9009c02002b2ab40001b9003e0100b9009d02002ab40001b9004001002bb800852ab40001b9004c01002bb800822ab40001b9003e01003e1d100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009e2bb800822ab40001b9004e01003a041904c70008124da700081904b600862bb800821904c7000911012ca700081904b60087b800882bb80089b1
toDataPre_GFE_9_0_0_0,266,2ab600592bb8009b2b2ab60058b9009c02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009d02002b2ab40001b9003d0100b9009c02002b2ab40001b9004b0100b9009c02002ab40001b9003e01003e2b1db9009d02002ab40001b9004001002bb800852ab40001b9004c01002bb800821d100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009e2bb800822ab40001b9004e01003a041904c70008124da700081904b600862bb800821904c7000911012ca700081904b60087b800882bb800892ab40001b90019010036052b150504b8008ab1
-
+
org/apache/geode/distributed/internal/membership/NetView,2
fromData,109,2a2bb8006ec0002bb500132a2bb9006f0100b500082a2bb80070b5000bb200409a00122ab4000bc7000bbb004159b70042bf2abb000c592ab4000bb7000db5000e2a2bb80071b500102a2bb80071b500122a2bb80072b500052bb800734d2cc6000d2ab400042cb900180200b1
toData,60,2ab400132bb800682b2ab40008b9006902002a2ab4000b2bb7006a2ab400102bb8006b2ab400122bb8006b2ab400052bb8006c2ab400042bb8006db1
-
+
org/apache/geode/distributed/internal/membership/gms/GMSMember,2
-fromData,62,2a2bb600482a2bb900490100b500072a2bb9004a0100b5003c2a2bb9004a0100b500092a2bb900490100b500082a2bb8004bb5000a2a2bb8004cb5000bb1
+fromData,62,2a2bb6004b2a2bb9004c0100b500072a2bb9004d0100b5003c2a2bb9004d0100b500092a2bb9004c0100b500082a2bb8004eb5000a2a2bb8004fb5000bb1
toData,62,2a2bb6003f2b2ab40007b9004002002b2ab4003cb9004102002b2ab40009b9004102002b2ab40008b9004002002ab4000a2bb800422ab4000b2bb80043b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
fromData,97,2a2bb8001dc0001ab500022bb9001e01003d2abb001f591cb70020b50005033e1d1ca2001a2ab400052bb8001dc0001ab90021020057840301a7ffe72a2bb9001e0100b500062a2bb9001e0100b500082a2bb80022b500042a2bb80023b50007b1
toData,114,2ab400022bb800142ab40005c6003a2b2ab40005b900150100b9001602002ab40005b9001701004d2cb9001801009900152cb900190100c0001a4e2d2bb80014a7ffe8a7000a2b03b9001602002b2ab40006b9001602002b2ab40008b9001602002ab400042bb8001b2ab400072bb8001cb1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
fromData,105,2a2bb80026c00027b500022a2bb80026c00027b500032a2bb80028b5000a2a2bb80029b5000c2a2bb9002a0100b500092ab400099a00342a2bb9002a0100b500042a2bb9002a0100b500072a2bb9002a0100b500082a2bb80026c0002bb500052a2bb8002cb50006b1
toData,89,2ab400022bb800212ab400032bb800212ab4000a2bb800222ab4000c2bb800232b2ab40009b9002402002b2ab40004b9002402002b2ab40007b9002402002b2ab40008b9002402002ab400052bb800212ab400062bb80025b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse,2
fromData,12,2a2bb80005c00006b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage,2
fromData,11,2a2bb900110100b50002b1
toData,11,2b2ab40002b900100200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage,2
fromData,22,2a2bb900130100b500022a2bb80014c00015b50003b1
toData,19,2b2ab40002b9001102002ab400032bb80012b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage,2
fromData,49,2a2bb700112a2bb900120100b500072ab800132bb90012010032b500052a2bb80014c00015b500022a2bb80014b50006b1
toData,45,2a2bb7000d2b2ab40007b9000e02002b2ab40005b6000fb9000e02002ab400022bb800102ab400062bb80010b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage,2
fromData,48,2a2bb8001bc0001cb500042a2bb8001bb500052a2bb8001db500022a2bb9001e0100b6001f2a2bb900200100b50006b1
toData,45,2ab400042bb800162ab400052bb800162ab400022bb800172b2ab60018b9001902002b2ab40006b9001a0200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage,2
fromData,47,2a2bb8001bc0001cb500022a2bb8001bc0001db500032a2bb8001eb500072a2bb8001fb500082a2bb8001fb50006b1
toData,41,2ab400022bb800182ab400032bb800182ab400072bb800192ab400082bb8001a2ab400062bb8001ab1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage,2
fromData,20,2a2bb8000cc0000db500032a2bb8000eb50004b1
toData,17,2ab400032bb8000a2ab400042bb8000bb1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage,2
fromData,20,2a2bb80015c00016b500032a2bb80017b50004b1
toData,17,2ab400032bb800132ab400042bb80014b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage,2
fromData,53,2bb9001b01003d033e1d1ca20029bb0016592bb8001cc0001d2bb8001eb7001f3a042ab400031904b90020020057840301a7ffd8b1
toData,81,2ab40003c600452b2ab40003b900110100b9001202002ab40003b9001301004d2cb9001401009900202cb900150100c000164e2db600172bb800182db600192bb8001aa7ffdda7000a2b03b900120200b1
-
+
org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage,2
fromData,37,2a2bb7000e2a2bb9000f0100b500032a2bb900100100b500042a2bb80011c00012b50005b1
toData,34,2a2bb7000a2b2ab40003b9000b02002b2ab40004b9000c02002ab400052bb8000db1
-
+
org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage,2
fromData,8,bb000859b70009bf
toData,8,bb000859b70009bf
-
+
org/apache/geode/distributed/internal/streaming/StreamingOperation$RequestStreamingMessage,2
fromData,16,2a2bb700202a2bb900210100b50003b1
toData,16,2a2bb700222b2ab40003b900230200b1
-
+
org/apache/geode/distributed/internal/streaming/StreamingOperation$StreamingReplyMessage,2
fromData,339,2a2bb700142bb9001501003d2a2bb900150100b500102a2bb900160100b500112a2bb900160100b500032bb800174e2db20018b600199e000704a700040336041c02a0000b2a01b50002a701082a1cb5000e2abb001a591cb7001bb500022ab4000399000704b8001c2ab40008b8001d3a051905c1001e3606013a07150699000d1905c0001eb6001f3a0703360803360915091ca20087b20020c6000cb2002006b900210200150699000fb80022990009043608a700672bb800233a0a150699004a1907c600451907b90024010099003b1504360b150b99001715099a0012190ac100259a000704a7000403360b150b990019bb0026591907c00027190ac00028c00028b700293a0a2ab40002190ab9002a020057840901a7ff7915089900172a04b50004b20020c6000cb2002005b9002102002ab4000399001a03b8001ca700133a0c2ab4000399000703b8001c190cbfb1
toData,85,2a2bb7002b2ab4000dc7000d2b02b9002c0200a7000d2b2ab4000eb9002c02002b2ab40010b9002c02002b2ab40011b9002d02002b2ab40003b9002d02002ab4000dc600122ab4000e9e000b2ab4000d2bb6002eb1
-
+
org/apache/geode/distributed/internal/tcpserver/InfoRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/InfoResponse,2
fromData,9,2a2bb80003b50002b1
toData,9,2ab400022bb80004b1
-
+
org/apache/geode/distributed/internal/tcpserver/ShutdownRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/ShutdownResponse,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/VersionRequest,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/distributed/internal/tcpserver/VersionResponse,2
fromData,11,2a2bb900060100b50004b1
toData,11,2b2ab40004b900050200b1
-
+
org/apache/geode/internal/DSFIDFactory,2
fromData,8,bb000259b70003bf
toData,8,bb000259b70003bf
-
+
org/apache/geode/internal/InternalDataSerializer$RegistrationMessage,2
fromData,39,2a2bb700282bb800292a2bb8002ab500042a2bb9002b0100b500062a2bb8002cc00008b50009b1
toData,32,2a2bb700242ab400042bb800252b2ab40006b9002602002ab400092bb80027b1
-
+
org/apache/geode/internal/InternalInstantiator$RegistrationContextMessage,2
fromData,14,2a2bb7001a2a2bb8001bb5000db1
toData,14,2a2bb7001c2ab4000d2bb8001db1
-
+
org/apache/geode/internal/InternalInstantiator$RegistrationMessage,3
fromDataProblem,38,2ab4000bc7000e2abb001b59b7001cb5000b2ab4000b2bb6001d572ab4000b121eb6001d57b1
fromData,125,2a2bb7001f2a2bb80020b500122a2bb80020b50013b80021c6004f2a2ab40012b80022b50003a7001b4d2ab2002404bd002559032c53b60026b700272a01b500032a2ab40013b80022b50005a7001b4d2ab2002804bd002559032c53b60026b700272a01b500052a2bb900290100b500072a2bb8002ac00009b5000ab1
toData,46,2a2bb700162ab40003b600172bb800182ab40005b600172bb800182b2ab40007b9001902002ab4000a2bb8001ab1
-
+
org/apache/geode/internal/ManagerInfo,2
fromData,61,2a2bb900540100b500182a2bb900540100b500192a2bb900540100b5001a2bb9005501003d1c9e00161cbc084e2b2db9005602002a2db80057b5001bb1
toData,74,2b2ab40018b9005002002b2ab40019b9005002002b2ab4001ab9005002002ab4001bc7000d2b03b900510200a7001d2ab4001bb600524d2b2cbeb9005102002b2c032cbeb900530400b1
-
+
org/apache/geode/internal/admin/ClientMembershipMessage,2
fromData,32,2a2bb7000d2a2bb8000eb500022a2bb8000eb500032a2bb9000f0100b50004b1
toData,32,2a2bb7000a2ab400022bb8000b2ab400032bb8000b2b2ab40004b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2
fromData,17,2a2bb700102a2bb80011c00012b50007b1
toData,14,2a2bb7000e2ab400072bb8000fb1
-
+
org/apache/geode/internal/admin/remote/AddHealthListenerResponse,2
fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/AddStatListenerRequest,2
fromData,26,2a2bb700112a2bb900120100b500042a2bb900130100b50006b1
toData,26,2a2bb7000e2b2ab40004b9000f03002b2ab40006b900100200b1
-
+
org/apache/geode/internal/admin/remote/AddStatListenerResponse,2
fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage,2
fromData,34,2a2bb7001a2a2bb9001b0100b500052a2bb9001b0100b500042a2bb8001cb50007b1
toData,34,2a2bb700172b2ab40005b9001802002b2ab40004b9001802002ab400072bb80019b1
-
+
org/apache/geode/internal/admin/remote/AdminConsoleMessage,2
fromData,16,2a2bb7000f2a2bb900100100b50005b1
toData,16,2a2bb7000d2b2ab40005b9000e0200b1
-
+
org/apache/geode/internal/admin/remote/AdminFailureResponse,2
fromData,17,2a2bb700092a2bb8000ac0000bb50005b1
toData,14,2a2bb700072ab400052bb80008b1
-
+
org/apache/geode/internal/admin/remote/AdminRequest,2
fromData,24,2a2bb7002b2a2bb9002c0100b500052a2bb8002db50003b1
toData,24,2a2bb700282b2ab40005b9002902002ab400032bb8002ab1
-
+
org/apache/geode/internal/admin/remote/AdminResponse,2
fromData,16,2a2bb700062a2bb900070100b50002b1
toData,16,2a2bb700042b2ab40002b900050200b1
-
+
org/apache/geode/internal/admin/remote/AlertLevelChangeMessage,2
fromData,16,2a2bb700132a2bb900140100b50004b1
toData,16,2a2bb700112b2ab40004b900120200b1
-
+
org/apache/geode/internal/admin/remote/AlertListenerMessage,2
fromData,69,2a2bb7001f2a2bb900200100b500062a2bb80021c00022b500072a2bb80023b500082a2bb80023b5000a2a2bb900240100b5000b2a2bb80023b5000c2a2bb80023b5000db1
toData,66,2a2bb7001a2b2ab40006b9001b02002ab400072bb8001c2ab400082bb8001d2ab4000a2bb8001d2b2ab4000bb9001e03002ab4000c2bb8001d2ab4000d2bb8001db1
-
+
org/apache/geode/internal/admin/remote/AlertsNotificationMessage,2
fromData,20,2a2bb700052a2bb80006c00007c00007b50003b1
toData,14,2a2bb700022ab400032bb80004b1
-
+
org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage,2
fromData,16,2a2bb700122a2bb900130100b50005b1
toData,16,2a2bb700102b2ab40005b900110200b1
-
+
org/apache/geode/internal/admin/remote/BridgeServerRequest,2
fromData,47,2a2bb700182a2bb900190100b500052a2bb900190100b500062a2bb8001ac0001bb5000a2a2bb900190100b5000fb1
toData,44,2a2bb700152b2ab40005b9001602002b2ab40006b9001602002ab4000a2bb800172b2ab4000fb900160200b1
-
+
org/apache/geode/internal/admin/remote/BridgeServerResponse,2
fromData,28,2a2bb700292a2bb8002ac0000fb5000b2a2bb8002ac00024b50025b1
toData,22,2a2bb700272ab4000b2bb800282ab400252bb80028b1
-
+
org/apache/geode/internal/admin/remote/CacheConfigRequest,2
fromData,36,2a2bb700112a2bb900120100b500032a2bb900130100b500042a2bb900130100b50006b1
toData,36,2a2bb7000e2b2ab40003b9000f02002b2ab40004b9001002002b2ab40006b900100200b1
-
+
org/apache/geode/internal/admin/remote/CacheConfigResponse,2
fromData,28,2a2bb7001c2a2bb8001dc00014b500092a2bb8001dc00017b50018b1
toData,22,2a2bb7001a2ab400092bb8001b2ab400182bb8001bb1
-
+
org/apache/geode/internal/admin/remote/CacheInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/CacheInfoResponse,2
fromData,17,2a2bb7000f2a2bb80010c00008b5000ab1
toData,14,2a2bb7000d2ab4000a2bb8000eb1
-
+
org/apache/geode/internal/admin/remote/CancelStatListenerRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/CancelStatListenerResponse,2
fromData,6,2a2bb7000ab1
toData,6,2a2bb70009b1
-
+
org/apache/geode/internal/admin/remote/CancellationMessage,2
fromData,16,2a2bb7000c2a2bb9000d0100b50004b1
toData,16,2a2bb7000a2b2ab40004b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2
fromData,16,2a2bb700072a2bb900080100b50003b1
toData,16,2a2bb700052b2ab40003b900060300b1
-
+
org/apache/geode/internal/admin/remote/ClientHealthStats,4
fromData,73,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000c2a2bb80014b50004b1
fromDataPre_GFE_8_0_0_0,65,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000cb1
toData,73,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000f2ab400042bb80010b1
toDataPre_GFE_8_0_0_0,65,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000fb1
-
+
org/apache/geode/internal/admin/remote/CompactRequest,2
fromData,6,2a2bb70029b1
toData,6,2a2bb7002ab1
-
+
org/apache/geode/internal/admin/remote/CompactResponse,2
fromData,14,2a2bb700042a2bb80005b50003b1
toData,14,2a2bb700062ab400032bb80007b1
-
+
org/apache/geode/internal/admin/remote/DestroyEntryMessage,2
fromData,25,2a2bb7001b2a2bb8001cc0001db500042a2bb8001cb50005b1
toData,22,2a2bb700192ab400042bb8001a2ab400052bb8001ab1
-
+
org/apache/geode/internal/admin/remote/DestroyRegionMessage,2
fromData,17,2a2bb7001a2a2bb8001bc0001cb50004b1
toData,14,2a2bb700182ab400042bb80019b1
-
+
org/apache/geode/internal/admin/remote/DurableClientInfoRequest,2
fromData,28,2a2bb7000c2a2bb8000db500032a2bb9000e0100b500042ab80005b1
toData,24,2a2bb700092ab400032bb8000a2b2ab40004b9000b0200b1
-
+
org/apache/geode/internal/admin/remote/DurableClientInfoResponse,2
fromData,16,2a2bb700172a2bb900180100b50002b1
toData,16,2a2bb700152b2ab40002b900160200b1
-
+
org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse,2
fromData,20,2a2bb7001e2a2bb8001fc00018c00018b50019b1
toData,14,2a2bb7001c2ab400192bb8001db1
-
+
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest,2
fromData,27,2a2bb7000d2bb9000e01003d2bb8000fc000104e2a1c2db70003b1
toData,24,2a2bb7000a2b2ab40005b9000b02002ab400062bb8000cb1
-
+
org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse,2
fromData,14,2a2bb7000c2a2bb8000db50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/FetchHostRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchHostResponse,2
fromData,67,2a2bb700342a2bb80035b500132a2bb80036c00037b5000e2a2bb80036c00014b500262a2bb80036c00014b500192a2bb900380100b5002d2a2bb900390100b50002b1
toData,58,2a2bb7002f2ab400132bb800302ab4000e2bb800312ab400262bb800312ab400192bb800312b2ab4002db9003203002b2ab40002b900330200b1
-
+
org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0300b1
-
+
org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse,2
fromData,20,2a2bb7000f2a2bb80010c00011c00011b50009b1
toData,14,2a2bb7000d2ab400092bb8000eb1
-
+
org/apache/geode/internal/admin/remote/FetchStatsRequest,2
fromData,14,2a2bb7000c2a2bb8000db50003b1
toData,14,2a2bb7000a2ab400032bb8000bb1
-
+
org/apache/geode/internal/admin/remote/FetchStatsResponse,2
fromData,20,2a2bb700152a2bb80016c00011c00011b5000fb1
toData,14,2a2bb700132ab4000f2bb80014b1
-
+
org/apache/geode/internal/admin/remote/FetchSysCfgRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/FetchSysCfgResponse,2
fromData,17,2a2bb7000d2a2bb8000ec0000fb50009b1
toData,14,2a2bb7000b2ab400092bb8000cb1
-
+
org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage,2
fromData,6,2a2bb70006b1
toData,6,2a2bb70005b1
-
+
org/apache/geode/internal/admin/remote/HealthListenerMessage,2
fromData,27,2a2bb7000e2a2bb9000f0100b500042a2bb80010c00011b50005b1
toData,24,2a2bb7000b2b2ab40004b9000c02002ab400052bb8000db1
-
+
org/apache/geode/internal/admin/remote/LicenseInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/LicenseInfoResponse,2
fromData,17,2a2bb7000b2a2bb8000cc00005b50007b1
toData,14,2a2bb700092ab400072bb8000ab1
-
+
org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1
fromData,6,2a2bb7002fb1
-
+
org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2
fromData,124,2a2bb700072bb9000801003d2abb0009591cb7000ab50002033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400021904b9000e020057840301a7ffdd2bb9000801003d2abb0009591cb7000ab50003033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400031904b9000e020057840301a7ffddb1
toData,110,2a2bb7000f2b2ab40002b900100100b9001102002ab40002b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe82b2ab40003b900100100b9001102002ab40003b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe8b1
-
+
org/apache/geode/internal/admin/remote/ObjectDetailsRequest,2
fromData,24,2a2bb700182a2bb80019b500032a2bb9001a0100b50004b1
toData,24,2a2bb700152ab400032bb800162b2ab40004b900170200b1
-
+
org/apache/geode/internal/admin/remote/ObjectDetailsResponse,2
fromData,33,2a2bb700192a2bb8001ab5000b2a2bb8001ab5000d2a2bb8001ac0000eb50011b1
toData,30,2a2bb700172ab4000b2bb800182ab4000d2bb800182ab400112bb80018b1
-
+
org/apache/geode/internal/admin/remote/ObjectNamesRequest,2
fromData,6,2a2bb70014b1
toData,6,2a2bb70013b1
-
+
org/apache/geode/internal/admin/remote/ObjectNamesResponse,2
fromData,17,2a2bb700162a2bb80017c00008b5000ab1
toData,14,2a2bb700142ab4000a2bb80015b1
-
+
org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2
fromData,35,2a2bb700292abb002a59b7002bb500022ab400022bb8002c2a2bb9002d0100b50003b1
toData,24,2a2bb7002e2ab400022bb8002f2b2ab40003b900300200b1
-
+
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2
fromData,6,2a2bb70009b1
toData,6,2a2bb70008b1
-
+
org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse,2
fromData,17,2a2bb7000e2a2bb8000fc00008b5000ab1
toData,14,2a2bb7000c2ab4000a2bb8000db1
-
+
org/apache/geode/internal/admin/remote/RegionAdminMessage,2
fromData,14,2a2bb700072a2bb80008b50002b1
toData,14,2a2bb700052ab400022bb80006b1
-
+
org/apache/geode/internal/admin/remote/RegionAdminRequest,2
fromData,14,2a2bb7000d2a2bb8000eb50002b1
toData,14,2a2bb7000b2ab400022bb8000cb1
-
+
org/apache/geode/internal/admin/remote/RegionAttributesRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/RegionAttributesResponse,2
fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/RegionRequest,2
fromData,57,2a2bb700142a2bb900150100b500032a2bb900150100b500052a2bb80016b500062a2bb80016b500082a2bb80017c00018b5000b2ab80007b1
toData,50,2a2bb700102b2ab40003b9001102002b2ab40005b9001102002ab400062bb800122ab400082bb800122ab4000b2bb80013b1
-
+
org/apache/geode/internal/admin/remote/RegionResponse,2
fromData,33,2a2bb700262a2bb80027b500162a2bb80027b5001b2a2bb80028c0001db5001eb1
toData,30,2a2bb700232ab400162bb800242ab4001b2bb800242ab4001e2bb80025b1
-
+
org/apache/geode/internal/admin/remote/RegionSizeRequest,2
fromData,6,2a2bb70015b1
toData,6,2a2bb70014b1
-
+
org/apache/geode/internal/admin/remote/RegionSizeResponse,2
fromData,26,2a2bb7000e2a2bb9000f0100b500082a2bb9000f0100b5000ab1
toData,26,2a2bb7000c2b2ab40008b9000d02002b2ab4000ab9000d0200b1
-
+
org/apache/geode/internal/admin/remote/RegionStatisticsRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/RegionStatisticsResponse,2
fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest,2
fromData,6,2a2bb70010b1
toData,6,2a2bb7000fb1
-
+
org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse,2
fromData,27,2a2bb700212a2bb900220100b500062a2bb80023c0000ab50002b1
toData,24,2a2bb7001e2b2ab40006b9001f02002ab400022bb80020b1
-
+
org/apache/geode/internal/admin/remote/RemoteBridgeServer,2
fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb900420100b500122a2bb900420100b500162a2bb900420100b5000e2a2bb900420100b500182a2bb900420100b5001a2a2bb900420100b500142a2bb80044b600452a2bb80046b600472a2bb80044b600482a2bb80049c0004ab6004b2a2bb8004cb6004d2a2bb900420100b5000c2a2bb900430100b500232ab600412bb900420100b9002902002ab600412bb80044b9002702002bb800444d2cc600102ab600412cb9002b0200a700102ab600412bb80044b9002d0200b1
toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1
-
+
org/apache/geode/internal/admin/remote/RemoteCacheInfo,2
fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1
toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteCacheStatistics,2
fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1
toData,51,2b2ab40003b9000e03002b2ab40005b9000e03002b2ab40007b9000e03002b2ab40009b9000e03002b2ab4000bb9000f0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteDLockInfo,2
fromData,76,2a2bb80017b500022a2bb80017b500052a2bb80017b500032a2bb900180100b500062a2bb900190100b500092a2bb8001ac0001bb500072a2bb9001c0100b5000c2a2bb9001c0100b5000bb1
toData,73,2ab400022bb800122ab400052bb800122ab400032bb800122b2ab40006b9001302002b2ab40009b9001402002ab400072bb800152b2ab4000cb9001603002b2ab4000bb900160300b1
-
+
org/apache/geode/internal/admin/remote/RemoteEntrySnapshot,2
fromData,36,2a2bb80023b500052a2bb80023b500112a2bb80023c00014b500172a2bb80023b50013b1
toData,33,2ab400052bb800222ab400112bb800222ab400172bb800222ab400132bb80022b1
-
+
org/apache/geode/internal/admin/remote/RemoteObjectName,2
fromData,27,2a2bb80013b500042a2bb80013b500062a2bb900140100b50008b1
toData,27,2ab400042bb800112ab400062bb800112b2ab40008b900120200b1
-
+
org/apache/geode/internal/admin/remote/RemoteRegionAttributes,2
fromData,404,2a2bb80080b500082a2bb80080b5000a2a2bb80081b5000d2a2bb80080b5007a2a2bb80082c00083b5000f2a2bb80082c00083b500112a2bb80082c00084b500132a2bb80082c00084b500152a2bb80082c00084b500172a2bb80080b500192a2bb80082c00084b5001b2a2bb80080b5001d2a2bb80082c00085b5001f2a2bb80082c00086b500212a2bb900870100b500232a2bb900870100b500252a2bb900880100b500272a2bb900890100b5002b2a2bb900880100b5002d2a2bb900870100b5002f2a2bb900870100b500312a2bb900870100b500332a2bb900870100b500352a2bb900870100b500372a2bb80082c0008ab5003b2a2bb80082c0008bc0008bb5003d2a2bb80082c0008cc0008cb5003f2a2bb900870100b5007f2a2bb80082c0008db500412a2bb80082c0008eb500432a2bb80082c0008fb500452a2bb80082c00002b500042a2bb900870100b500472a2bb80080b500392a2bb900870100b5004b2a2bb80081b5004e2a2bb900870100b500052a2bb900870100b500292a2bb80080b500522a2bb900870100b50054b1
toData,353,2ab400082bb800782ab4000a2bb800782ab4000d2bb800792ab4007a2bb800782ab4000f2bb8007b2ab400112bb8007b2ab400132bb8007b2ab400152bb8007b2ab400172bb8007b2ab400192bb800782ab4001b2bb8007b2ab4001d2bb800782ab4001f2bb8007b2ab400212bb8007b2b2ab40023b9007c02002b2ab40025b9007c02002b2ab40027b9007d02002b2ab4002bb9007e02002b2ab4002db9007d02002b2ab4002fb9007c02002b2ab40031b9007c02002b2ab40033b9007c02002b2ab40035b9007c02002b2ab40037b9007c02002ab4003b2bb8007b2ab4003d2bb8007b2ab4003f2bb8007b2b2ab4007fb9007c02002ab400412bb8007b2ab400432bb8007b2ab400452bb8007b2ab400042bb8007b2b2ab40047b9007c02002ab400392bb800782b2ab4004bb9007c02002ab4004e2bb800792b2ab40005b9007c02002b2ab40029b9007c02002ab400522bb800782b2ab40054b9007c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoteRegionSnapshot,2
fromData,59,2a2bb80029b500032a2bb8002ac00009b5000c2a2bb8002ac00005b500072a2bb9002b0100b500102a2bb9002b0100b500122a2bb8002ab5001cb1
toData,53,2ab400032bb800262ab4000c2bb800272ab400072bb800272b2ab40010b9002802002b2ab40012b9002802002ab4001c2bb80027b1
-
+
org/apache/geode/internal/admin/remote/RemoteStat,2
fromData,66,2a2bb8002ab500052a2bb9002b0100b5000e2a2bb9002c0100b500032a2bb8002ab500072a2bb8002ab5000b2a2bb8002dc0002eb500102a2bb9002f0100b50009b1
toData,63,2ab400052bb800252b2ab4000eb9002602002b2ab40003b9002702002ab400072bb800252ab4000b2bb800252ab400102bb800282b2ab40009b900290200b1
-
+
org/apache/geode/internal/admin/remote/RemoteStatResource,2
fromData,45,2a2bb9001a0100b500032a2bb9001a0100b500052a2bb8001bb500072a2bb8001bb5000a2a2bb8001bb5000cb1
toData,45,2b2ab40003b9001803002b2ab40005b9001803002ab400072bb800192ab4000a2bb800192ab4000c2bb80019b1
-
+
org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse,2
fromData,6,2a2bb70008b1
toData,6,2a2bb70007b1
-
+
org/apache/geode/internal/admin/remote/ResetHealthStatusRequest,2
fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
org/apache/geode/internal/admin/remote/ResetHealthStatusResponse,2
fromData,6,2a2bb7000ab1
toData,6,2a2bb70009b1
-
+
org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2
fromData,25,2a2bb7001d2abb001e59b7001fb500022ab400022bb80020b1
toData,14,2a2bb700212ab400022bb80022b1
-
+
org/apache/geode/internal/admin/remote/RootRegionRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/RootRegionResponse,2
fromData,28,2a2bb700232a2bb80024c00019b5001a2a2bb80024c00019b5001bb1
toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
fromData,16,2a2bb700072a2bb900080100b50005b1
toData,16,2a2bb700092b2ab40005b9000a0200b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllRequest,2
fromData,6,2a2bb70044b1
toData,6,2a2bb70045b1
-
+
org/apache/geode/internal/admin/remote/ShutdownAllResponse,2
fromData,16,2a2bb700072a2bb900080100b50002b1
toData,16,2a2bb700052b2ab40002b900060200b1
-
+
org/apache/geode/internal/admin/remote/SnapshotResultMessage,2
fromData,27,2a2bb7000e2a2bb8000fc00010b500062a2bb900110100b50007b1
toData,24,2a2bb7000b2ab400062bb8000c2b2ab40007b9000d0200b1
-
+
org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage,2
fromData,30,2a2bb700102a2bb900110100b500052a2bb80012c00013c00013b50002b1
toData,24,2a2bb7000d2b2ab40005b9000e03002ab400022bb8000fb1
-
+
org/apache/geode/internal/admin/remote/StatListenerMessage,2
fromData,86,2a2bb700112a2bb900120100b500042a2bb900130100b500052a2ab40005bc0ab500062a2ab40005bc07b50007033d1c2ab40005a200212ab400061c2bb9001301004f2ab400071c2bb90014010052840201a7ffddb1
toData,66,2a2bb7000d2b2ab40004b9000e03002b2ab40005b9000f0200033d1c2ab40005a200212b2ab400061c2eb9000f02002b2ab400071c31b900100300840201a7ffddb1
-
+
org/apache/geode/internal/admin/remote/StoreSysCfgRequest,2
fromData,17,2a2bb7000d2a2bb8000ec0000fb50003b1
toData,14,2a2bb7000b2ab400032bb8000cb1
-
+
org/apache/geode/internal/admin/remote/StoreSysCfgResponse,2
fromData,6,2a2bb7000eb1
toData,6,2a2bb7000db1
-
+
org/apache/geode/internal/admin/remote/SubRegionRequest,2
fromData,6,2a2bb7000db1
toData,6,2a2bb7000cb1
-
+
org/apache/geode/internal/admin/remote/SubRegionResponse,2
fromData,34,2a2bb7001f2a2bb80020c00013c00013b500142a2bb80020c00013c00013b50015b1
toData,22,2a2bb7001d2ab400142bb8001e2ab400152bb8001eb1
-
+
org/apache/geode/internal/admin/remote/TailLogRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/TailLogResponse,2
fromData,22,2a2bb7001a2a2bb8001bb5000d2a2bb8001bb5000ab1
toData,22,2a2bb700182ab4000d2bb800192ab4000a2bb80019b1
-
+
org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage,2
fromData,30,2a2bb700092a2bb9000a0100b500042a2bb8000bc0000cc0000cb50003b1
toData,24,2a2bb700062b2ab40004b9000702002ab400032bb80008b1
-
+
org/apache/geode/internal/admin/remote/VersionInfoRequest,2
fromData,6,2a2bb7000bb1
toData,6,2a2bb7000ab1
-
+
org/apache/geode/internal/admin/remote/VersionInfoResponse,2
fromData,14,2a2bb7000a2a2bb8000bb50006b1
toData,14,2a2bb700082ab400062bb80009b1
-
+
org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl,2
fromData,12,2a2bb8002bc0002cb50002b1
toData,9,2ab400022bb8002ab1
-
+
org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl,2
fromData,31,2a2bb900100100b500022a2bb900100100b500032a2bb900100100b50004b1
toData,31,2b2ab40002b9000f02002b2ab40003b9000f02002b2ab40004b9000f0200b1
-
+
org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl,2
fromData,14,2a2bb700212a2bb80022b50002b1
toData,14,2a2bb7001f2ab400022bb80020b1
-
+
org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl,2
fromData,28,2a2bb700252a2bb80026c00027b500032a2bb80026c00027b50004b1
toData,22,2a2bb700232ab400032bb800242ab400042bb80024b1
-
+
org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl,2
fromData,31,2a2bb8002fb500032a2bb80030b500072a2bb80031c00032c00032b50009b1
toData,25,2ab400032bb8002c2ab400072bb8002d2ab400092bb8002eb1
-
+
org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl,2
fromData,25,2a2bb700262a2bb80027c00028b500032a2bb80029b50004b1
toData,22,2a2bb700232ab400032bb800242ab400042bb80025b1
-
+
org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl,2
fromData,28,2a2bb80031b500032a2bb80032b500072a2bb80033c00020b50002b1
toData,25,2ab400032bb8002e2ab400072bb8002f2ab400022bb80030b1
-
+
org/apache/geode/internal/admin/statalerts/StatisticInfoImpl,2
fromData,1,b1
toData,1,b1
-
+
org/apache/geode/internal/cache/AbstractRegion,2
-fromData,11,bb017459130175b70176bf
-toData,6,2a2bb80173b1
-
+fromData,11,bb017359130174b70175bf
+toData,6,2a2bb80172b1
+
org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2
fromData,16,2a2bb700182a2bb900190100b5000cb1
toData,16,2a2bb7001a2b2ab4000cb9001b0300b1
-
+
org/apache/geode/internal/cache/AddCacheServerProfileMessage,2
fromData,16,2a2bb7002f2a2bb900300100b50008b1
toData,16,2a2bb7002d2b2ab40008b9002e0200b1
-
+
org/apache/geode/internal/cache/BucketAdvisor$BucketProfile,2
fromData,36,2a2bb700132a2bb900140100b500042a2bb900140100b500062a2bb900140100b50012b1
toData,36,2a2bb700152b2ab40004b9001602002b2ab40006b9001602002b2ab40012b900160200b1
-
+
org/apache/geode/internal/cache/BucketAdvisor$ServerBucketProfile,2
fromData,22,2a2bb700162a2bb80017b500052a2bb80018b50004b1
toData,22,2a2bb700192ab400052bb8001a2ab400042bb8001bb1
-
+
org/apache/geode/internal/cache/BucketServerLocation,2
fromData,39,2a2bb700062a2bb80007b60008b500032a2bb80009b6000ab500042a2bb8000bb6000cb50005b1
toData,39,2a2bb7000d2ab40003b8000e2bb8000f2ab40004b800102bb800112ab40005b800122bb80013b1
-
+
org/apache/geode/internal/cache/BucketServerLocation66,2
fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb60010b500052a2bb900110100b500092a2ab40009bd0006b500072ab400099e001d033d1c2ab40009a200132ab400071c2bb8001253840201a7ffebb1
toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
-
+
org/apache/geode/internal/cache/CacheDistributionAdvisor$CacheProfile,2
fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1
toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1
-
+
org/apache/geode/internal/cache/CacheServerAdvisor$CacheServerProfile,2
fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
toData,42,2a2bb7000b2ab400042bb8000c2b2ab40006b9000d02002ab400052bb8000e2b2ab6000fb900100300b1
-
+
org/apache/geode/internal/cache/ClientRegionEventImpl,2
fromData,14,2a2bb700142a2bb80015b60003b1
toData,14,2a2bb700122ab6000d2bb80013b1
-
+
org/apache/geode/internal/cache/CloseCacheMessage,2
fromData,16,2a2bb700172a2bb900180100b50002b1
toData,16,2a2bb700192b2ab40002b9001a0200b1
-
+
org/apache/geode/internal/cache/ControllerAdvisor$ControllerProfile,2
fromData,6,2a2bb70007b1
toData,6,2a2bb70006b1
-
+
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
fromData,45,2a2bb7009f2a2bb800a0b5000a2a2bb800a1c00055b500432a2bb900a20100b500032a2bb900a30100b50065b1
toData,42,2a2bb700a52ab4000a2bb800a62ab400432bb800a72b2ab40003b900a802002b2ab40065b900a90200b1
-
+
org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1
toData,191,2a2bb7001a2b2ab4000ac6000704a7000403b9001b02002ab4000ac6000b2ab4000a2bb8001c2ab4000cc7000d2b03b9001d0200a700322ab4000cb6001e3d2b1cb9001d0200033e1d1ca2001c2ab4000c1db6001fc0000f3a0419042bb80020840301a7ffe52ab40014c600192b04b9001b02002b2ab40014c0002103b80022a7000a2b03b9001b02002ab40017c600152b04b9001b02002ab400172bb80020a7000a2b03b9001b02002b2ab40018b9001b02002b2ab40004b900230300b1
-
+
org/apache/geode/internal/cache/DestroyOperation$DestroyMessage,2
fromData,45,2a2bb700322a2bb80033c00034b500022a2bb80033b500272bb800354d2cb6003699000b2a2bb80037b50005b1
toData,118,2a2bb700382ab400022bb800392ab400272bb800392ab40003b6003ac000084d2cc1003b99002e2cb6003c4e2db6003d990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fa700262cb60043990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fb1
-
+
org/apache/geode/internal/cache/DestroyOperation$DestroyWithContextMessage,2
fromData,14,2a2bb700102a2bb80011b50008b1
toData,14,2a2bb700122ab400082bb80013b1
-
+
org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,2
fromData,76,2a2bb700432a2bb80044b500062a2bb900450100b80046b500082a2bb900470100b5000a2bb9004701003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004701004f840301a7ffecb1
toData,77,2a2bb700482ab400062bb800492b2ab40008b4004ab9004b02002b2ab4000ab9004c02002b2ab4000dbeb9004c0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004c0200840201a7ffe8b1
-
+
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2
fromData,41,2a2bb700582a2bb80059c0005ab500082a2bb8005bb500112a2bb8005cb5001f2a2bb8005db50029b1
toData,38,2a2bb7005e2ab400082bb8005f2ab400112bb800602ab4001f2bb800612ab400292bb80062b1
-
+
org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionWithContextMessage,2
fromData,14,2a2bb7000e2a2bb8000fb50006b1
toData,14,2a2bb700102ab400062bb80011b1
-
+
org/apache/geode/internal/cache/DistTXCommitMessage,2
fromData,14,2a2bb700302a2bb80031b50003b1
toData,14,2a2bb700322ab400032bb80033b1
-
+
org/apache/geode/internal/cache/DistTXCommitMessage$DistTXCommitReplyMessage,2
fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage,2
fromData,14,2a2bb700332a2bb80034b5000ab1
toData,14,2a2bb700312ab4000a2bb80032b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTXPrecommitReplyMessage,2
fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitResponse,2
fromData,17,2a2bb80008b500032a2bb80009b50004b1
toData,17,2ab400032bb800062ab400042bb80007b1
-
+
org/apache/geode/internal/cache/DistTXRollbackMessage,2
fromData,6,2a2bb70015b1
toData,6,2a2bb70016b1
-
+
org/apache/geode/internal/cache/DistTXRollbackMessage$DistTXRollbackReplyMessage,2
fromData,14,2a2bb700192a2bb8001ab50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
fromData,291,2bb9009601003d2bb9009601003e2a1cb500972a1c2bb600982a2bb80099b500102a2bb9009a0100b8009bb500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009cb500892a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001e2ab4001e9900382bb9009a0100360415049a000b2a03b5001fa7001b150404a0000b2a04b5001fa7000dbb009d59129eb7009fbf2a2bb800a0b500201c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a115049900162abb00a259b700a3b5000e2ab4000e2bb800a41c1110007e99001c1c1120007e99000704a700040336052a15052bb800a5b5000a1d1104007e9900082a04b5000fb1
toData,202,033d033e2a1cb600a63d2a1db600a73e2b1cb900a802002b1db900a802002ab4000d9e000d2b2ab4000db900a902002ab400102bb800aa2b2ab40009b400abb900ac02002ab40089c6000b2ab400892bb800ad2ab4001e9900542b2ab4001f99000704a7000403b900ac02002ab4001fb800ae36042ab4001f9a001f2ab40020c10021990015013a052ab40020c00021c000213a06a7000c2ab400203a05013a061504190519062bb800af2ab4000ec6000b2ab4000e2bb800b02ab4000ac6000b2ab4000a2bb800b0b1
-
+
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2
fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
toData,43,2a2bb700282b2ab40002b60016b9002902002ab400062bb8002a2ab400172bb8002a2ab400112bb8002ab1
-
+
org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionWithContextMessage,2
fromData,14,2a2bb7000e2a2bb8000fb50006b1
toData,14,2a2bb700102ab400062bb80011b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$EntryVersionsList,2
fromData,268,2bb9002201003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990011b8001212231cb80016b9002403001d9900ca2bb80025883605b80012b20013b900140200990015b80012b2001312261505b80027b900280400bb0029591505b700023a0603360715071505a2008e2bb90022010036081508aa000000007b00000000000000030000001e0000002700000035000000542a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001cb9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002588360a19091906150ab9002c0200c0002db600212a1909b6000757840701a7ff71b1
toData,289,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b900140200990015b80012b2001312152a1cb80016b9001705002b1cb9001802001d9900b32ab60008852bb80019bb001a592ab60008b7001b3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900180200a7006c1907b6001c3a081908c700132b04b90018020019072bb8001da7005019041908b6001e360915099a00242b05b90018020084050115053609190419081509b6001f5719072bb8001da700212b06b90018020019072b03b6002019071908b6002115090464852bb80019a7ff72b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
-
+
org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllMessage,2
fromData,197,2a2bb700392a2bb8003ac0003bb500052a2bb8003c88b500152a2ab40015bd003db500062ab400159e00722bb8003e4dbb003f59b700404e03360415042ab40015a200202ab400061504bb003d592b2ab4000515042c2db7004153840401a7ffdd2bb9004201003604150499002f2bb800433a0503360615062ab40015a2001d2ab4000615063219051506b60044c00045b5002b840601a7ffe02ab400461140007e99000e2a2bb8003ac00047b5000b2a2ab400461180007e99000704a7000403b5001ab1
toData,165,2a2bb700482ab400052bb800492ab40015852bb8004a2ab400159e007bbb004b592ab40015b7004c4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004d572ab4000615043201b5002b2ab400061504322bb6004e2ab400061504321905b5002b840401a7ffac2b1db9004f02001d9900082c2bb800502ab4000bc6000b2ab4000b2bb80049b1
-
+
org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage,2
fromData,171,2a2bb700632bb9006401003d1c047e9900142a2bb900650100b500092ab40009b800661c077e99000d2a2bb900650100b500061c057e99000e2a2bb80067c00068b500072bb800674e2dc100699900252a03b5000e2a2dc00069b8006ab500082ab40008c7001b2a2dc00069b5004ea700102a2dc0006bb500082a04b5000e2a2bb80067c0006cb5000a2a2bb8006db5000c2a2bb8006eb5000b2a1c10407e99000704a7000403b5000db1
toData,173,2a2bb70070033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007102002ab4000999000d2b2ab40009b9007202002ab40006029f000d2b2ab40006b9007202002ab40007c6000b2ab400072bb800732ab4000e99000e2ab400082bb80073a700102ab40008b9005901002bb800732ab4000a2bb800732ab4000cc000742bb800752ab4000b2bb80076b1
-
+
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
-
+
org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
fromData,197,2a2bb700382a2bb80039c0003ab500052a2bb8003b88b500152a2ab40015bd003cb500062ab400159e00722bb8003d4dbb003e59b7003f4e03360415042ab40015a200202ab400061504bb003c592b2ab4000515042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40015a2001d2ab4000615063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00046b5000b2a2ab400451180007e99000704a7000403b5001ab1
toData,165,2a2bb700472ab400052bb800482ab40015852bb800492ab400159e007bbb004a592ab40015b7004b4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004c572ab4000615043201b5002b2ab400061504322bb6004d2ab400061504321905b5002b840401a7ffac2b1db9004e02001d9900082c2bb8004f2ab4000bc6000b2ab4000b2bb80048b1
-
+
org/apache/geode/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
fromData,125,2a2bb700172ab800182bb90019010032b5001a2bb9001b01003d2abb001c591cb7001db500122bb9001e01003e03360415041ca2003e1d990019bb001f59b700203a0619062bb8002119063a05a700092bb800223a052ab4001219052bb900230100b80024b90025030057840401a7ffc22a2bb80026c00027b50004b1
toData,227,2a2bb700282b2ab4001ab60029b9002a02002b2ab40012b9002b0100b9002c0200033d122d4e2ab40012b9002e01009a00252ab40012b9002f0100b900300100b900310100c000323a041904c1001f990005043d2b1cb9003302002ab40012b900340100b9003001003a041904b9003501009900681904b900310100c000363a051905b900370100c000323a061906c1001f99001c1c9a000cbb0038592db70039bf1906c0001f2bb8003aa700191c99000cbb0038592db70039bf1906c0003b2bb6003c2b1905b9003d0100c0003eb6003fb900400300a7ff942ab400042bb80041b1
-
+
org/apache/geode/internal/cache/DynamicRegionAttributes,2
fromData,17,2a2bb80005b500022a2bb80005b50003b1
toData,17,2ab400022bb800042ab400032bb80004b1
-
+
org/apache/geode/internal/cache/EntryEventImpl,2
fromData,216,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500082ab4001b2bb80016b600202a2bb80016c00021b500092bb900220100990013b200239a003cbb0024591225b70026bf2bb9002201009900212a2bb80027b500282a2ab40028b500062a2ab40028b80029b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80027b5002a2a2ab4002ab80029b50007a7000b2a2bb80016b500072a2bb8002bb5002c2a2bb8002db5000a2a2bb8002eb50013b1
toData,279,2ab400182bb801472ab600892bb801472ab4001bb601742bb801472b2ab4001eb40175b9017602002b2ab4000811c03f7eb9017702002ab600492bb801472ab400092bb801472b03b9017802002ab6003f4d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d99003b2ab40028c6000e2ab400282bb80179a7002e2ab40006c6000e2ab400062bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab700414d2cc100803e1d99000d2cc00080b900a901003e2b1db9017802001d9900292ab4002ac6000e2ab4002a2bb80179a7001c2cc000803a041904b900b701002bb8017aa700082c2bb801472ab4002cc0017b2bb8017c2ab600572bb801472ab400132bb8017db1
-
+
org/apache/geode/internal/cache/EntrySnapshot,2
fromData,50,2a03b500052bb9004201003d1c9900112abb000759b70043b50004a7000e2abb000359b70044b500042ab400042bb60045b1
toData,22,2b2ab40004c10007b9004002002ab400042bb60041b1
-
+
org/apache/geode/internal/cache/EventID,4
fromData,53,2a2bb80038b500042bb80038b800394d2a2cb8003ab500092a2cb8003ab5000b2a2bb9003b0100b5000c2a2bb9003c0100b50001b1
fromDataPre_GFE_8_0_0_0,33,2a2bb80038b500042bb80038b800394d2a2cb8003ab500092a2cb8003ab5000bb1
toData,44,2ab400042bb800352ab400092ab4000bb800332bb800352b2ab4000cb9003602002b2ab40001b900370200b1
toDataPre_GFE_8_0_0_0,24,2ab400042bb800352ab400092ab4000bb800332bb80035b1
-
+
org/apache/geode/internal/cache/EventTracker$EventSeqnoHolder,2
fromData,22,2a2bb9000e0100b500042a2bb8000fc00010b50005b1
toData,19,2b2ab40004b9001103002ab400052bb80012b1
-
+
org/apache/geode/internal/cache/EvictionAttributesImpl,2
fromData,33,2a2bb9001b0100b500072a2bb8001cc0001db500052a2bb8001cc0001eb50003b1
toData,27,2b2ab40007b9001902002ab400052bb8001a2ab400032bb8001ab1
-
+
org/apache/geode/internal/cache/FilterProfile,2
fromData,210,bb013159b701324d2c2bb801332a2cb500202ab4000d2bb80134b900300200572ab400052bb80135b9007802002ab400072bb80135b9007802002ab400092bb80135b9007802002ab4000e2bb80134b900300200572ab400062bb80135b9007802002ab400082bb80135b9007802002ab4000a2bb80135b9007802002bb801363e1d9e004f05b80138360403360515051da2002c2bb801393a062bb8013a3a072a1906190703b6013b2ab4000f19061907b90054030057840501a7ffd41504b8013857a7000e3a081504b80138571908bfb1
toData,181,2ab40020c001312bb8013d2ab4000d2ab40023b401182bb8013e2ab400052bb8013f2ab400072bb8013f2ab400092bb8013f2ab4000e2ab40023b401182bb8013e2ab400062bb8013f2ab400082bb8013f2ab4000a2bb8013f2ab4000f4d2cb900b901003e1d2bb801402cb900ae0100b900af01003a041904b900b001009900361904b900b10100c000b23a051905b9011b0100c0003c3a061905b900b30100c000843a0719062bb8014119072bb8013da7ffc6b1
-
+
org/apache/geode/internal/cache/FilterProfile$OperationMessage,2
fromData,129,2a2bb700522a2bb900530100b500092a2bb900540100b500412ab800552bb90056010032b500232a2bb900570100b500292a2bb900580100b5004a2ab40023b8004c99002c2a2bb900540100b500322ab40023b2004ea5000d2ab40023b2004fa600202a2bb80059b50033a700152a2bb900580100b500252a2bb8005ab50027b1
toData,133,2a2bb700452b2ab40009b9004602002b2ab40041b9004702002b2ab40023b60024b9004802002b2ab40029b9004902002b2ab4004ab9004b03002ab40023b8004c9900312b2ab40033b9004d0100b9004702002ab40023b2004ea5000d2ab40023b2004fa600202ab400332bb80050a700152b2ab40025b9004b03002ab400272bb80051b1
-
+
org/apache/geode/internal/cache/FilterRoutingInfo,4
fromData,88,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1
fromDataPre_GFE_7_1_0_0,97,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1
toData,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb600261904b9001c0100c000083a0619062bb80027a7ffc8b1
toDataPre_GFE_7_1_0_0,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb800271904b9001c0100c000083a0619062bb80027a7ffc8b1
-
+
org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
fromData,9,2a2bb80014b50015b1
fromDataPre_GFE_8_0_0_0,50,b800279900162a2bb80028b500292a2bb80014b50015a7001b2a2bb8002ab500012a2bb8002bb5000e2a2bb8002bb50012b1
toData,255,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000f2cb600253a0419042bb80026b1
toDataPre_GFE_8_0_0_0,213,b800279900b1bb0018591103e82bb8002cb700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000d2cb600254e2d2bb80026a700232ab400012bb8002d2ab4000e2ab400212bb800222ab400122ab400212bb80022b1
-
+
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
fromData,24,2a2bb7001e2a2bb9001f0100b500052a2bb80020b50006b1
toData,24,2a2bb700212b2ab40005b9002202002ab400062bb80023b1
-
+
org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueReply,2
fromData,14,2a2bb700042a2bb80005b50002b1
toData,14,2a2bb700062ab400022bb80007b1
-
+
org/apache/geode/internal/cache/FindRemoteTXMessage,2
fromData,27,2a2bb700452a2bb80046c00047b500032a2bb900480100b50004b1
toData,24,2a2bb700422ab400032bb800432b2ab40004b900440200b1
-
+
org/apache/geode/internal/cache/FindRemoteTXMessage$FindRemoteTXMessageReply,2
fromData,46,2a2bb7000a2a2bb9000b0100b500042bb9000b01009900182a2bb9000b0100b500072a2bb8000cc0000db50006b1
toData,66,2a2bb700032b2ab40004b9000502002ab40006c6000704a70004033d2b1cb9000502001c99001d2b2ab40007b9000502002ab4000601b600082ab400062bb80009b1
-
+
org/apache/geode/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2
fromData,55,2a2bb700232a2bb900240100b500032a2bb900250100b500042abb002659b70027b500052ab400052bb800282a2bb900290100b50006b1
toData,44,2a2bb7001e2b2ab40003b9001f02002b2ab40004b9002002002ab400052bb800212b2ab40006b900220200b1
-
+
org/apache/geode/internal/cache/FindVersionTagOperation$VersionTagReply,2
fromData,17,2a2bb7000c2a2bb8000dc0000eb50002b1
toData,14,2a2bb7000a2ab400022bb8000bb1
-
+
org/apache/geode/internal/cache/FixedPartitionAttributesImpl,2
fromData,39,2a2bb80007b500062a2bb900080100b500022a2bb900090100b500032a2bb900090100b50005b1
toData,39,2ab400062bb8000a2b2ab40002b9000b02002b2ab40003b9000c02002b2ab40005b9000c0200b1
-
+
org/apache/geode/internal/cache/FunctionStreamingReplyMessage,2
fromData,64,2a2bb700102a2bb900110100b5000b2a2bb900120100b5000c2a2bb900110100b500042a2bb80013b5000da700144dbb001559b700164e2d2cb60017572dbfb1
toData,90,2a2bb700182b2ab4000bb9001902002b2ab4000cb9001a02002b2ab40004b9001902002ab4000d2bb8001ba7002e4d2cc1001c99000cbb001d592cb7001ebfbb0015592ab4000db6001fb60020b700214e2d2cb60017572dbfb1
-
+
org/apache/geode/internal/cache/GridAdvisor$GridProfile,2
fromData,26,2a2bb7001e2a2bb8001fb500052a2bb80020b500062ab60007b1
toData,22,2a2bb7001b2ab400052bb8001c2ab400062bb8001db1
-
+
org/apache/geode/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1
toData,45,2a2bb70009033d2ab400069900091cb20005803d2ab400089900091cb20007803d2b1c1100ff7eb9000a0200b1
-
+
org/apache/geode/internal/cache/InitialImageFlowControl$FlowControlPermitMessage,2
fromData,16,2a2bb7000d2a2bb9000e0100b50002b1
toData,16,2a2bb7000f2b2ab40002b900100200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$Entry,2
fromData,89,2a2bb900150100b500032bb9001501003d2a2bb80016b5000f2ab40003b8001199000d2ab20017b50002a7000b2a2bb80018b500022a2bb900190100b500041c047e9900162a1c057e99000704a70004032bb8001ab5000ab1
toData,101,2b2ab40003b9000c02002ab4000ac6000704a70004033d1c2ab4000ac1000e99000705a700040380913d2b1cb9000c02002ab4000f2bb800102ab40003b800119a000b2ab400022bb800122b2ab40004b9001303002ab4000ac6000b2ab4000a2bb80014b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2
fromData,230,2a2bb7008f2a2bb80090b5001f2ab4000403322bb80090b5003e2ab4000403322bb80090b500412ab4000403322bb80090b500432ab4000403322bb80090b500452ab4000403322bb80090b500472ab4000403322bb80090b500492ab4000403322bb80090b5004b2ab4000403322bb80090b5004d2ab4000404322bb80090b5003e2ab4000404322bb80090b500412ab4000404322bb80090b500432ab4000404322bb80090b500452ab4000404322bb80090b500472ab4000404322bb80090b500492ab4000404322bb80090b5004b2ab4000404322bb80090b5004d2a2bb80090b50033b1
toData,284,2a2bb7008d2ab4001fc000312bb8008e2ab400040332b4003ec000312bb8008e2ab400040332b40041c000312bb8008e2ab400040332b40043c000312bb8008e2ab400040332b40045c000312bb8008e2ab400040332b40047c000312bb8008e2ab400040332b40049c000312bb8008e2ab400040332b4004bc000312bb8008e2ab400040332b4004dc000312bb8008e2ab400040432b4003ec000312bb8008e2ab400040432b40041c000312bb8008e2ab400040432b40043c000312bb8008e2ab400040432b40045c000312bb8008e2ab400040432b40047c000312bb8008e2ab400040432b40049c000312bb8008e2ab400040432b4004bc000312bb8008e2ab400040432b4004dc000312bb8008e2ab40033c000312bb8008eb1
-
+
org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2
fromData,224,2a2bb7001c2bb8001d4d014e2cc600102cb6001e9e00092c03b6001f4e2dc1002099000e2a2dc00021b5000fa700082a2cb5000f2a2bb900220100b500102a2bb900220100b500112a2bb900220100b500122a2bb900230100b500132a2bb900220100b500142a2bb80024b500042a2bb900230100b500032a2bb900230100b500152ab4001599000f2abb0025592bb70026b500022bb900270100360415049b00102abb0028591504b70029b5000103360515051504a200292bb8002ac0002b3a062bb8002c37072ab4000119061607b8002db9002e030057840501a7ffd6b1
toData,234,2a2bb7002f2ab4000fc1002099001dbb00305904b700314d2c2ab4000fb60032572c2bb80033a7000e2ab4000fc000302bb800332b2ab40010b9003402002b2ab40011b9003402002b2ab40012b9003402002b2ab40013b9003502002b2ab40014b9003402002b2ab40003b9003502002b2ab40015b9003502002ab4001599000b2ab400022bb800362b2ab40001c7000702a7000c2ab40001b900370100b9003802002ab40001c600422ab40001b900390100b9003a01004d2cb9003b010099002a2cb9003c0100c0003d4e2db9003e01002bb8003f2db900400100c00041b600422bb80043a7ffd3b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
fromData,406,b80022b20023b9002402003d2bb9003601003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c990014b80022b2002312371db80026b900380400150499003c2bb800398836071c990015b80022b20023123a1507b80031b90038040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900e42bb800398836071c990015b80022b20023123c1507b80031b9003804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a22bb900360100360a150aaa000000008f00000000000000030000001e0000002c0000003f000000632ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002db900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600342ab40004190bb90011020057840901a7ff5da7000e2abb000359b70001b50004b1
toData,396,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b900240200990015b80022b2002312252a1cb80026b9002705002b1cb9002802001d9900282ab7000e852bb8002903360515052ab7000ea200132a1505b700132bb8002a840501a7ffea15049900cd2ab40004b9000d0100852bb80029bb002b592ab40004b9000d0100b7002c3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900280200a700771908b6002d3a091909c700132b04b90028020019082bb8002ea7005b19051909b9002f0200c000303a0a190ac700292b05b9002802001506840601b800313a0a19051909190ab9003203005719082bb8002ea700222b06b90028020019082b03b6003319081909b60034190ab60035852bb80029a7ff67b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2
fromData,33,2a2bb700162bb9001701003d1c9900132bb9001701003e2a1d2bb80018b50004b1
toData,51,2a2bb700092ab40004c600222b04b9000a02002b2ab40004c1000bb9000a02002ab400042bb6000ca7000a2b03b9000a0200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2
fromData,66,2a2bb7001c2a2bb9001d0100b500052bb9001d01003d1c99000f2a2b2ab40005b8001eb500042bb9001d01003d1c9900132bb9001d01003e2a1d2bb8001fb50006b1
toData,97,2a2bb7000b2b2ab40005b9000c02002ab40004c600192b04b9000c02002b2ab400042ab40005b8000da7000a2b03b9000c02002ab40006c600222b04b9000c02002b2ab40006c1000eb9000c02002ab400062bb8000fa7000a2b03b9000c0200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2
fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1
toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestImageMessage,2
fromData,98,2a2bb700b42a2bb800b5b500172a2bb900b60100b500022a2bb900b70100b500552a2bb900b70100b500032a2bb900b70100b5004b2a2bb800b8c000b9b5003a2a2bb800b8c000bab500262a2bb800b8c000bbb5003b2a2bb800b8c000bcb50030b1
toData,86,2a2bb700bd2ab400172bb800be2b2ab40002b900bf02002b2ab40055b900c002002b2ab40003b900c002002b2ab4004bb900c002002ab4003a2bb800c12ab400262bb800c12ab4003b2bb800c12ab400302bb800c1b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestRVVMessage,2
fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1
toData,34,2a2bb700222ab400052bb800232b2ab40002b9002402002b2ab40003b900250200b1
-
+
org/apache/geode/internal/cache/InitialImageOperation$RequestSyncMessage,2
fromData,73,2a2bb700222a2bb80023b500022bb9002401003d2bb9002501003e2a1dbd0026b5000a03360415041da2001f2ab4000a15041c99000a2bb80027a700072bb8002853840401a7ffe1b1
toData,77,2a2bb7001c2ab400022bb8001d2b2ab4000a0332c1001eb9001f02002b2ab4000abeb9002002002ab4000a4d2cbe3e03360415041da200172c1504323a0519052bb900210200840401a7ffe9b1
-
+
org/apache/geode/internal/cache/InterestRegistrationEventImpl,2
fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1
toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1
-
+
org/apache/geode/internal/cache/InvalidateOperation$InvalidateMessage,2
fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1
toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1
-
+
org/apache/geode/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
fromData,14,2a2bb7000c2a2bb8000db50004b1
toData,14,2a2bb7000e2ab400042bb8000fb1
-
+
org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage,2
fromData,14,2a2bb700152a2bb80016b50004b1
toData,14,2a2bb700172ab400042bb80018b1
-
+
org/apache/geode/internal/cache/InvalidateRegionOperation$InvalidateRegionMessage,2
fromData,17,2a2bb700122a2bb80013c00014b50007b1
toData,14,2a2bb700152ab400072bb80016b1
-
+
org/apache/geode/internal/cache/JtaAfterCompletionMessage,2
fromData,26,2a2bb700232a2bb900240100b500042a2bb900240100b50002b1
toData,26,2a2bb700212b2ab40004b9002202002b2ab40002b900220200b1
-
+
org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2
fromData,163,2a2bb700512bb9005201003d1c047e9900142a2bb900530100b500082ab40008b800541c077e99000d2a2bb900530100b500051c057e99000e2a2bb80055c00056b500062bb800554e2dc1002a9900252a03b5000a2a2dc0002ab80057b500072ab40007c7001b2a2dc0002ab5001aa700102a2dc00058b500072a04b5000a2a2bb80055b500092a2bb80055c00059b500102a1c10407e99000704a7000403b5000bb1
toData,162,2a2bb7005b033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005c02002ab4000899000d2b2ab40008b9005d02002ab40005029f000d2b2ab40005b9005d02002ab40006c6000b2ab400062bb8005e2ab4000a99000e2ab400072bb8005ea700102ab40007b9001f01002bb8005e2ab400092bb8005e2ab400102bb8005eb1
-
+
org/apache/geode/internal/cache/Node,2
fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1
toData,49,2ab400052bb800182b2ab40003b9001902002b2ab40004b9001a02002b2ab40015b9001b02002b2ab40006b900190200b1
-
+
org/apache/geode/internal/cache/NonLocalRegionEntry,2
fromData,48,2a2bb80027b500032a2bb80027b500062a2bb900280100b5000c2a2bb900290100b5000e2a2bb80027c0002ab50011b1
toData,45,2ab400032bb800242ab400062bb800242b2ab4000cb9002503002b2ab4000eb9002602002ab400112bb80024b1
-
+
org/apache/geode/internal/cache/NonLocalRegionEntryWithStats,2
fromData,36,2a2bb700132a2bb900140100b500032a2bb900140100b500052a2bb900140100b50007b1
toData,36,2a2bb700112b2ab40003b9001203002b2ab40005b9001203002b2ab40007b900120300b1
-
+
org/apache/geode/internal/cache/PRQueryProcessor$EndOfBucket,2
fromData,11,2a2bb9000b0100b50002b1
toData,11,2b2ab40002b9000c0200b1
-
+
org/apache/geode/internal/cache/PartitionAttributesImpl,2
fromData,102,2a2bb900580100b5001b2a2bb900590100b500082a2bb900580100b5000c2a2bb900580100b500012a2bb8005ab500142a2bb8005bc0001eb5000d2a2bb8005bc0001eb500022a2bb900590100b500162a2bb900590100b500182a2bb8005bc0005cb5002fb1
toData,97,2ab7002b2b2ab4001bb9005402002b2ab40008b9005503002b2ab60047b9005402002b2ab40001b9005402002ab400142bb800562ab4000d2bb800572ab400022bb800572b2ab40016b9005503002b2ab40018b9005503002ab4002f2bb80057b1
-
+
org/apache/geode/internal/cache/PartitionRegionConfig,2
fromData,207,2a2bb900500100b500162a2bb900510100b80052b500032a2bb80053b500182a2bb900540100b500052a2bb900540100b5001f2abb001959b7001ab500042ab400042bb800552a2bb80056b500082a2bb80056b500092a2bb80056b500072a2bb80057b5000c2a2bb80058b5000e2a2bb80058b5000d2a2bb80058b500102a2bb80058b5000f2a2bb900540100b500062a2bb80059c0005ab500112ab40011c7000e2abb002159b70022b500112a2bb8005bb500142a2bb80059c0005ab500012ab40001c7000a2ab80015b50001b1
toData,178,2b2ab40016b9004702002b2ab40003b40048b9004902002ab400182bb8004a2b2ab40005b9004b02002b2ab4001fb9004b02002ab400042bb8004a2ab400082bb8004c2ab400092bb8004c2ab400072bb8004c2ab4000c2bb8004a2ab4000e2bb8004a2ab4000d2bb8004a2ab400102bb8004a2ab4000f2bb8004a2b2ab40006b9004b02002ab400112bb8004d2ab400142bb8004e2ab40001b9004f010099000b012bb8004da7000b2ab400012bb8004db1
-
+
org/apache/geode/internal/cache/PoolFactoryImpl$PoolAttributes,2
fromData,145,2a2bb80032b500032a2bb80032b500052a2bb80032b500072a2bb80032b500092a2bb80032b5000a2a2bb80032b5000b2a2bb80032b5000f2a2bb80033b5000e2a2bb80033b500122a2bb80032b500162a2bb80032b500182a2bb80034b500082a2bb80034b500142a2bb80035b5001b2a2bb80036b5001f2a2bb80036b500202a2bb80032b500132a2bb80034b5001cb1
toData,145,2ab400032bb8002d2ab400052bb8002d2ab400072bb8002d2ab400092bb8002d2ab4000a2bb8002d2ab4000b2bb8002d2ab4000f2bb8002d2ab4000e2bb8002e2ab400122bb8002e2ab400162bb8002d2ab400182bb8002d2ab400082bb8002f2ab400142bb8002f2ab4001b2bb800302ab4001f2bb800312ab400202bb800312ab400132bb8002d2ab4001c2bb8002fb1
-
+
org/apache/geode/internal/cache/PreferBytesCachedDeserializable,2
fromData,9,2a2bb8000fb50003b1
toData,9,2ab400032bb80010b1
-
+
org/apache/geode/internal/cache/QueuedOperation,1
toData,78,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900312ab400032bb800372ab40002b600169a000d2ab40002b600159900152b2ab40006b9003602002ab400042bb80038b1
-
+
org/apache/geode/internal/cache/RegionEventImpl,2
fromData,48,2a2bb80023b500092a2bb80024b500022a2bb900250100b80026b5000a2a2bb900270100b500032a2bb80028b5000bb1
toData,51,2ab400092bb8001c2ab400022bb8001d2b2ab4000ab4001eb9001f02002b2ab40003b9002002002ab4000bc000212bb80022b1
-
+
org/apache/geode/internal/cache/ReleaseClearLockMessage,2
fromData,24,2a2bb700212a2bb80022b500022a2bb900230100b50003b1
toData,24,2a2bb700242ab400022bb800252b2ab40003b900260200b1
-
+
org/apache/geode/internal/cache/RemoteContainsKeyValueMessage,2
fromData,33,2a2bb7002e2a2bb8002fb500062a2ab4003010407e99000704a7000403b50005b1
toData,14,2a2bb700312ab400062bb80032b1
-
+
org/apache/geode/internal/cache/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2
fromData,16,2a2bb700152a2bb900160100b50003b1
toData,16,2a2bb700172b2ab40003b900180200b1
-
+
org/apache/geode/internal/cache/RemoteDestroyMessage,2
fromData,131,2a2bb700892a2bb8008ab7008b2a2bb8008ab5000c2a2bb9008c0100b8008db5000e2ab4008e1102007e99000e2a2bb8008ac0008fb500102ab4008e1104007e99000e2a2bb8008ac00035b500672a2bb8008ac00090b500122ab400059900122bb9008c0100572a2bb80091b700222a2bb8008ab500082a2bb8008ac00092b50017b1
toData,135,2a2bb700932ab6006a2bb800942ab4000c2bb800942b2ab4000eb40095b9009602002ab40010c6000b2ab400102bb800942ab40067c6000b2ab400672bb800942ab400122bb800942ab4000599002a2b2ab4000699000704a7000403b9009602002ab40006b800973d1c2ab700982ab6006e2bb800992ab400082bb800942ab400172bb80094b1
-
+
org/apache/geode/internal/cache/RemoteDestroyMessage$DestroyReplyMessage,2
fromData,52,2a2bb700232bb9002401003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80025b50009b1
toData,57,2a2bb7001f033d2ab40009c600081c0480913d2ab40009c100209900081c0580913d2b1cb9002102002ab40009c6000b2ab400092bb80022b1
-
+
org/apache/geode/internal/cache/RemoteFetchEntryMessage,2
fromData,14,2a2bb700312a2bb80032b50004b1
toData,14,2a2bb700332ab400042bb80034b1
-
+
org/apache/geode/internal/cache/RemoteFetchEntryMessage$FetchEntryReplyMessage,2
fromData,58,2a2bb7001e2bb9001f01003d1c9a002c2ab40002b80020c000214e2dc7000dbb00225
<TRUNCATED>
[18/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapObjectKey.java
index 01a6e2d..4c8e188 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapObjectKey.java
@@ -15,11 +15,16 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,27 +32,46 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,6 +79,7 @@ public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapObjectKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -85,13 +110,19 @@ public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -107,7 +138,9 @@ public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -131,7 +164,7 @@ public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -142,24 +175,31 @@ public class VMThinRegionEntryOffHeapObjectKey extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey1.java
index b19fe07..72b4884 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey1.java
@@ -15,11 +15,16 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,23 +32,38 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -62,9 +82,11 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -72,6 +94,7 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapStringKey1.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -102,13 +125,19 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -124,7 +153,9 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -148,7 +179,7 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -159,19 +190,23 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -185,7 +220,7 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -204,6 +239,7 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -233,5 +269,8 @@ public class VMThinRegionEntryOffHeapStringKey1 extends VMThinRegionEntryOffHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey2.java
index a33f2da..2a597b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapStringKey2.java
@@ -15,11 +15,16 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,23 +32,38 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -74,9 +94,11 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -84,6 +106,7 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapStringKey2.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -114,13 +137,19 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -136,7 +165,9 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -160,7 +191,7 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -171,19 +202,23 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -202,7 +237,7 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -232,6 +267,7 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -274,5 +310,7 @@ public class VMThinRegionEntryOffHeapStringKey2 extends VMThinRegionEntryOffHeap
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapUUIDKey.java
index ecdb0e4..0ccba15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapUUIDKey.java
@@ -15,12 +15,18 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -28,28 +34,45 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,6 +80,7 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -87,13 +111,19 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -109,7 +139,9 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -133,7 +165,7 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -144,24 +176,28 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -174,5 +210,8 @@ public class VMThinRegionEntryOffHeapUUIDKey extends VMThinRegionEntryOffHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
index 2011602..14bda85 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
@@ -15,33 +15,45 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,14 +61,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapIntKey
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -65,10 +96,11 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -88,7 +120,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -99,19 +131,22 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -128,7 +163,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -136,7 +171,9 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -161,7 +198,6 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -201,108 +237,113 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -312,7 +353,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -322,6 +363,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapIntKey.class,
"hitCount");
@@ -330,7 +372,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -339,12 +381,12 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -357,14 +399,15 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -376,7 +419,10 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -393,6 +439,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -410,6 +457,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -439,6 +487,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -471,12 +520,17 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -487,5 +541,8 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
index 6a0de6e..342f083 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
@@ -15,33 +15,45 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,14 +61,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapLongKey
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -65,10 +96,11 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -88,7 +120,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -99,19 +131,22 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -128,7 +163,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -136,7 +171,9 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -161,7 +198,6 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -201,108 +237,113 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -312,7 +353,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -322,6 +363,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapLongKey.class,
"hitCount");
@@ -330,7 +372,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -339,12 +381,12 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -357,14 +399,15 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -376,7 +419,10 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -393,6 +439,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -410,6 +457,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -439,6 +487,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -471,12 +520,15 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -487,5 +539,8 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
index 35d416a..eacccab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
@@ -15,33 +15,45 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,14 +61,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapObjectKey
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -65,10 +95,11 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -88,7 +119,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -99,19 +130,22 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -128,7 +162,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -136,7 +170,9 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -161,7 +197,6 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -201,108 +236,113 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -312,7 +352,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -322,6 +362,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapObjectKey.class,
"hitCount");
@@ -330,7 +371,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -339,12 +380,12 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -357,14 +398,15 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -376,7 +418,10 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -393,6 +438,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -410,6 +456,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -439,6 +486,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -471,13 +519,19 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
index efc2dbf..11055da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
@@ -15,33 +15,45 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,10 +61,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapStringKey1
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -71,9 +98,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -82,10 +111,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -105,7 +135,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -116,19 +146,22 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -145,7 +178,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -153,7 +186,9 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -178,7 +213,6 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -218,108 +252,113 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -329,7 +368,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -339,6 +378,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapStringKey1.class,
"hitCount");
@@ -347,7 +387,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -356,12 +396,12 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -374,14 +414,15 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -393,7 +434,10 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -410,6 +454,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -427,6 +472,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -456,6 +502,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -488,8 +535,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -503,7 +553,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -522,6 +572,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -551,5 +602,8 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[55/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index 7a2d33d..b6c11c4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -41,6 +41,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARC
import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__PASSWORD;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.server.CacheServer;
@@ -188,62 +189,46 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliMetaData(shellOnly = true,
relatedTopic = {CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE})
public Result startLocator(
- @CliOption(key = CliStrings.START_LOCATOR__MEMBER_NAME, mandatory = false,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
+ @CliOption(key = CliStrings.START_LOCATOR__MEMBER_NAME,
help = CliStrings.START_LOCATOR__MEMBER_NAME__HELP) String memberName,
@CliOption(key = CliStrings.START_LOCATOR__BIND_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__BIND_ADDRESS__HELP) final String bindAddress,
@CliOption(key = CliStrings.START_LOCATOR__CLASSPATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__CLASSPATH__HELP) final String classpath,
@CliOption(key = CliStrings.START_LOCATOR__FORCE, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_LOCATOR__FORCE__HELP) final Boolean force,
@CliOption(key = CliStrings.START_LOCATOR__GROUP, optionContext = ConverterHint.MEMBERGROUP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__GROUP__HELP) final String group,
@CliOption(key = CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS__HELP) final String hostnameForClients,
@CliOption(key = CliStrings.START_LOCATOR__INCLUDE_SYSTEM_CLASSPATH,
specifiedDefaultValue = "true", unspecifiedDefaultValue = "false",
help = CliStrings.START_LOCATOR__INCLUDE_SYSTEM_CLASSPATH__HELP) final Boolean includeSystemClasspath,
@CliOption(key = CliStrings.START_LOCATOR__LOCATORS,
optionContext = ConverterHint.LOCATOR_DISCOVERY_CONFIG,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__LOCATORS__HELP) final String locators,
@CliOption(key = CliStrings.START_LOCATOR__LOG_LEVEL, optionContext = ConverterHint.LOG_LEVEL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__LOG_LEVEL__HELP) final String logLevel,
@CliOption(key = CliStrings.START_LOCATOR__MCAST_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__MCAST_ADDRESS__HELP) final String mcastBindAddress,
@CliOption(key = CliStrings.START_LOCATOR__MCAST_PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__MCAST_PORT__HELP) final Integer mcastPort,
@CliOption(key = CliStrings.START_LOCATOR__PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__PORT__HELP) final Integer port,
@CliOption(key = CliStrings.START_LOCATOR__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__DIR__HELP) String workingDirectory,
@CliOption(key = CliStrings.START_LOCATOR__PROPERTIES,
optionContext = ConverterHint.FILE_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__PROPERTIES__HELP) String gemfirePropertiesPathname,
@CliOption(key = CliStrings.START_LOCATOR__SECURITY_PROPERTIES,
optionContext = ConverterHint.FILE_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__SECURITY_PROPERTIES__HELP) String gemfireSecurityPropertiesPathname,
@CliOption(key = CliStrings.START_LOCATOR__INITIALHEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__INITIALHEAP__HELP) final String initialHeap,
@CliOption(key = CliStrings.START_LOCATOR__MAXHEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__MAXHEAP__HELP) final String maxHeap,
@CliOption(key = CliStrings.START_LOCATOR__J,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__J__HELP) final String[] jvmArgsOpts,
@CliOption(key = CliStrings.START_LOCATOR__CONNECT, unspecifiedDefaultValue = "true",
specifiedDefaultValue = "true",
@@ -257,10 +242,8 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliOption(key = CliStrings.START_LOCATOR__CLUSTER__CONFIG__DIR, unspecifiedDefaultValue = "",
help = CliStrings.START_LOCATOR__CLUSTER__CONFIG__DIR__HELP) final String clusterConfigDir,
@CliOption(key = CliStrings.START_LOCATOR__HTTP_SERVICE_PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__HTTP_SERVICE_PORT__HELP) final Integer httpServicePort,
@CliOption(key = CliStrings.START_LOCATOR__HTTP_SERVICE_BIND_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_LOCATOR__HTTP_SERVICE_BIND_ADDRESS__HELP) final String httpServiceBindAddress) {
try {
if (StringUtils.isBlank(memberName)) {
@@ -272,17 +255,17 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
gemfirePropertiesPathname = CliUtil.resolvePathname(gemfirePropertiesPathname);
- if (!StringUtils.isBlank(gemfirePropertiesPathname)
+ if (StringUtils.isNotBlank(gemfirePropertiesPathname)
&& !IOUtils.isExistingPathname(gemfirePropertiesPathname)) {
return ResultBuilder.createUserErrorResult(
- CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
- StringUtils.EMPTY_STRING, gemfirePropertiesPathname));
+ CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY,
+ gemfirePropertiesPathname));
}
gemfireSecurityPropertiesPathname =
CliUtil.resolvePathname(gemfireSecurityPropertiesPathname);
- if (!StringUtils.isBlank(gemfireSecurityPropertiesPathname)
+ if (StringUtils.isNotBlank(gemfireSecurityPropertiesPathname)
&& !IOUtils.isExistingPathname(gemfireSecurityPropertiesPathname)) {
return ResultBuilder.createUserErrorResult(
CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
@@ -295,42 +278,41 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
Properties gemfireProperties = new Properties();
- gemfireProperties.setProperty(GROUPS, StringUtils.valueOf(group, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(LOCATORS,
- StringUtils.valueOf(locators, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(LOG_LEVEL,
- StringUtils.valueOf(logLevel, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(MCAST_ADDRESS,
- StringUtils.valueOf(mcastBindAddress, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(MCAST_PORT,
- StringUtils.valueOf(mcastPort, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(GROUPS, StringUtils.defaultString(group));
+ gemfireProperties.setProperty(LOCATORS, StringUtils.defaultString(locators));
+ gemfireProperties.setProperty(LOG_LEVEL, StringUtils.defaultString(logLevel));
+ gemfireProperties.setProperty(MCAST_ADDRESS, StringUtils.defaultString(mcastBindAddress));
+ gemfireProperties.setProperty(MCAST_PORT, StringUtils.defaultString(mcastPort));
gemfireProperties.setProperty(ENABLE_CLUSTER_CONFIGURATION,
- StringUtils.valueOf(enableSharedConfiguration, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(enableSharedConfiguration));
gemfireProperties.setProperty(LOAD_CLUSTER_CONFIGURATION_FROM_DIR,
- StringUtils.valueOf(loadSharedConfigurationFromDirectory, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(loadSharedConfigurationFromDirectory));
gemfireProperties.setProperty(CLUSTER_CONFIGURATION_DIR,
- StringUtils.valueOf(clusterConfigDir, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(HTTP_SERVICE_PORT,
- StringUtils.valueOf(httpServicePort, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(clusterConfigDir));
+ gemfireProperties.setProperty(HTTP_SERVICE_PORT, StringUtils.defaultString(httpServicePort));
gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS,
- StringUtils.valueOf(httpServiceBindAddress, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(httpServiceBindAddress));
// read the OSProcess enable redirect system property here -- TODO: replace with new GFSH
// argument
final boolean redirectOutput =
Boolean.getBoolean(OSProcess.ENABLE_OUTPUT_REDIRECTION_PROPERTY);
- LocatorLauncher locatorLauncher =
- new LocatorLauncher.Builder().setBindAddress(bindAddress).setForce(force)
- .setHostnameForClients(hostnameForClients).setMemberName(memberName).setPort(port)
- .setRedirectOutput(redirectOutput).setWorkingDirectory(workingDirectory).build();
+ LocatorLauncher.Builder locatorLauncherBuilder =
+ new LocatorLauncher.Builder().setBindAddress(bindAddress).setForce(force).setPort(port)
+ .setRedirectOutput(redirectOutput).setWorkingDirectory(workingDirectory);
+ if (hostnameForClients != null) {
+ locatorLauncherBuilder.setHostnameForClients(hostnameForClients);
+ }
+ if (memberName != null) {
+ locatorLauncherBuilder.setMemberName(memberName);
+ }
+ LocatorLauncher locatorLauncher = locatorLauncherBuilder.build();
String[] locatorCommandLine = createStartLocatorCommandLine(locatorLauncher,
gemfirePropertiesPathname, gemfireSecurityPropertiesPathname, gemfireProperties,
classpath, includeSystemClasspath, jvmArgsOpts, initialHeap, maxHeap);
- // getGfsh().logInfo(StringUtils.concat(locatorCommandLine, " "), null);
-
final Process locatorProcess = new ProcessBuilder(locatorCommandLine)
.directory(new File(locatorLauncher.getWorkingDirectory())).start();
@@ -502,7 +484,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
commandLine.add(LocatorLauncher.class.getName());
commandLine.add(LocatorLauncher.Command.START.getName());
- if (!StringUtils.isBlank(launcher.getMemberName())) {
+ if (StringUtils.isNotBlank(launcher.getMemberName())) {
commandLine.add(launcher.getMemberName());
}
@@ -518,7 +500,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
commandLine.add("--force");
}
- if (!StringUtils.isBlank(launcher.getHostnameForClients())) {
+ if (StringUtils.isNotBlank(launcher.getHostnameForClients())) {
commandLine.add("--hostname-for-clients=" + launcher.getHostnameForClients());
}
@@ -615,7 +597,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
jmxManagerSslEnabled, infoResultData);
}
- if (!StringUtils.isBlank(responseFailureMessage)) {
+ if (StringUtils.isNotBlank(responseFailureMessage)) {
infoResultData.addLine("\n");
infoResultData.addLine(responseFailureMessage);
}
@@ -639,7 +621,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
message.append("Authentication");
}
if (jmxManagerSslEnabled) {
- message.append(jmxManagerAuthEnabled ? " and " : StringUtils.EMPTY_STRING)
+ message.append(jmxManagerAuthEnabled ? " and " : StringUtils.EMPTY)
.append("SSL configuration");
}
if (jmxManagerAuthEnabled || jmxManagerSslEnabled) {
@@ -657,7 +639,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
private Map<String, String> loadConfigurationProperties(
final String configurationPropertiesPathname, Map<String, String> configurationProperties) {
configurationProperties =
- (configurationProperties != null ? configurationProperties : new HashMap<String, String>());
+ (configurationProperties != null ? configurationProperties : new HashMap<>());
if (IOUtils.isExistingPathname(configurationPropertiesPathname)) {
try {
@@ -763,22 +745,17 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
public Result statusLocator(
@CliOption(key = CliStrings.STATUS_LOCATOR__MEMBER,
optionContext = ConverterHint.LOCATOR_MEMBER_IDNAME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_LOCATOR__MEMBER__HELP) final String member,
@CliOption(key = CliStrings.STATUS_LOCATOR__HOST,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_LOCATOR__HOST__HELP) final String locatorHost,
@CliOption(key = CliStrings.STATUS_LOCATOR__PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_LOCATOR__PORT__HELP) final Integer locatorPort,
@CliOption(key = CliStrings.STATUS_LOCATOR__PID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_LOCATOR__PID__HELP) final Integer pid,
@CliOption(key = CliStrings.STATUS_LOCATOR__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_LOCATOR__DIR__HELP) final String workingDirectory) {
try {
- if (!StringUtils.isBlank(member)) {
+ if (StringUtils.isNotBlank(member)) {
if (isConnectedAndReady()) {
final MemberMXBean locatorProxy = getMemberMXBean(member);
@@ -802,9 +779,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
final LocatorState state = locatorLauncher.status();
return createStatusLocatorResult(state);
}
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
return ResultBuilder.createUserErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -824,18 +799,15 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
public Result stopLocator(
@CliOption(key = CliStrings.STOP_LOCATOR__MEMBER,
optionContext = ConverterHint.LOCATOR_MEMBER_IDNAME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_LOCATOR__MEMBER__HELP) final String member,
@CliOption(key = CliStrings.STOP_LOCATOR__PID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_LOCATOR__PID__HELP) final Integer pid,
@CliOption(key = CliStrings.STOP_LOCATOR__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_LOCATOR__DIR__HELP) final String workingDirectory) {
LocatorState locatorState;
try {
- if (!StringUtils.isBlank(member)) {
+ if (StringUtils.isNotBlank(member)) {
if (isConnectedAndReady()) {
final MemberMXBean locatorProxy = getMemberMXBean(member);
@@ -887,13 +859,11 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
}
- return ResultBuilder.createInfoResult(StringUtils.EMPTY_STRING);
+ return ResultBuilder.createInfoResult(StringUtils.EMPTY);
} else {
return ResultBuilder.createUserErrorResult(locatorState.toString());
}
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
return ResultBuilder.createUserErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -917,7 +887,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
if (StringUtils.isBlank(gemfireProperties.getProperty(LOCATORS))) {
String currentLocators = getCurrentLocators();
- if (!StringUtils.isBlank(currentLocators)) {
+ if (StringUtils.isNotBlank(currentLocators)) {
commandLine.add("-D".concat(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX)
.concat(LOCATORS).concat("=").concat(currentLocators));
}
@@ -934,14 +904,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
protected void addGemFirePropertyFile(final List<String> commandLine,
final String gemfirePropertiesPathname) {
- if (!StringUtils.isBlank(gemfirePropertiesPathname)) {
+ if (StringUtils.isNotBlank(gemfirePropertiesPathname)) {
commandLine.add("-DgemfirePropertyFile=" + gemfirePropertiesPathname);
}
}
protected void addGemFireSecurityPropertyFile(final List<String> commandLine,
final String gemfireSecurityPropertiesPathname) {
- if (!StringUtils.isBlank(gemfireSecurityPropertiesPathname)) {
+ if (StringUtils.isNotBlank(gemfireSecurityPropertiesPathname)) {
commandLine.add("-DgemfireSecurityPropertyFile=" + gemfireSecurityPropertiesPathname);
}
}
@@ -951,7 +921,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
for (final Object property : gemfireProperties.keySet()) {
final String propertyName = property.toString();
final String propertyValue = gemfireProperties.getProperty(propertyName);
- if (!StringUtils.isBlank(propertyValue)) {
+ if (StringUtils.isNotBlank(propertyValue)) {
commandLine.add(
"-D" + DistributionConfig.GEMFIRE_PREFIX + "" + propertyName + "=" + propertyValue);
}
@@ -959,7 +929,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
protected void addInitialHeap(final List<String> commandLine, final String initialHeap) {
- if (!StringUtils.isBlank(initialHeap)) {
+ if (StringUtils.isNotBlank(initialHeap)) {
commandLine.add("-Xms" + initialHeap);
}
}
@@ -997,7 +967,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
protected void addMaxHeap(final List<String> commandLine, final String maxHeap) {
- if (!StringUtils.isBlank(maxHeap)) {
+ if (StringUtils.isNotBlank(maxHeap)) {
commandLine.add("-Xmx" + maxHeap);
commandLine.add("-XX:+UseConcMarkSweepGC");
commandLine.add("-XX:CMSInitiatingOccupancyFraction=" + CMS_INITIAL_OCCUPANCY_FRACTION);
@@ -1053,8 +1023,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
try {
fileReader = new BufferedReader(new FileReader(pidFile));
return Integer.parseInt(fileReader.readLine());
- } catch (IOException ignore) {
- } catch (NumberFormatException ignore) {
+ } catch (IOException | NumberFormatException ignore) {
} finally {
IOUtils.close(fileReader);
}
@@ -1094,7 +1063,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
protected String getClasspath(final String userClasspath) {
String classpath = getSystemClasspath();
- if (!StringUtils.isBlank(userClasspath)) {
+ if (StringUtils.isNotBlank(userClasspath)) {
classpath += (File.pathSeparator + userClasspath);
}
@@ -1124,9 +1093,9 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
String toClasspath(final boolean includeSystemClasspath, String[] jarFilePathnames,
String... userClasspaths) {
// gemfire jar must absolutely be the first JAR file on the CLASSPATH!!!
- String classpath = getGemFireJarPath();
+ StringBuilder classpath = new StringBuilder(getGemFireJarPath());
- userClasspaths = (userClasspaths != null ? userClasspaths : StringUtils.EMPTY_STRING_ARRAY);
+ userClasspaths = (userClasspaths != null ? userClasspaths : ArrayUtils.EMPTY_STRING_ARRAY);
// Then, include user-specified classes on CLASSPATH to enable the user to override GemFire JAR
// dependencies
@@ -1137,30 +1106,30 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
// System CLASSPATH environment variable setting, which is consistent with the Java platform
// behavior...
for (String userClasspath : userClasspaths) {
- if (!StringUtils.isBlank(userClasspath)) {
- classpath += (classpath.isEmpty() ? StringUtils.EMPTY_STRING : File.pathSeparator);
- classpath += userClasspath;
+ if (StringUtils.isNotBlank(userClasspath)) {
+ classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator);
+ classpath.append(userClasspath);
}
}
// Now, include any System-specified CLASSPATH environment variable setting...
if (includeSystemClasspath) {
- classpath += File.pathSeparator;
- classpath += getSystemClasspath();
+ classpath.append(File.pathSeparator);
+ classpath.append(getSystemClasspath());
}
jarFilePathnames =
- (jarFilePathnames != null ? jarFilePathnames : StringUtils.EMPTY_STRING_ARRAY);
+ (jarFilePathnames != null ? jarFilePathnames : ArrayUtils.EMPTY_STRING_ARRAY);
// And finally, include all GemFire dependencies on the CLASSPATH...
for (String jarFilePathname : jarFilePathnames) {
- if (!StringUtils.isBlank(jarFilePathname)) {
- classpath += (classpath.isEmpty() ? StringUtils.EMPTY_STRING : File.pathSeparator);
- classpath += jarFilePathname;
+ if (StringUtils.isNotBlank(jarFilePathname)) {
+ classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator);
+ classpath.append(jarFilePathname);
}
}
- return classpath;
+ return classpath.toString();
}
protected String getGemFireJarPath() {
@@ -1194,7 +1163,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
protected String getLocatorId(final String host, final Integer port) {
final String locatorHost = (host != null ? host : getLocalHost());
final String locatorPort =
- StringUtils.valueOf(port, String.valueOf(DistributionLocator.DEFAULT_LOCATOR_PORT));
+ StringUtils.defaultString(port, String.valueOf(DistributionLocator.DEFAULT_LOCATOR_PORT));
return locatorHost.concat("[").concat(locatorPort).concat("]");
}
@@ -1238,7 +1207,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
try {
String objectNamePattern = ManagementConstants.OBJECTNAME__PREFIX;
- objectNamePattern += (StringUtils.isBlank(serviceName) ? StringUtils.EMPTY_STRING
+ objectNamePattern += (StringUtils.isBlank(serviceName) ? StringUtils.EMPTY
: "service=" + serviceName + StringUtils.COMMA_DELIMITER);
objectNamePattern += "type=Member,*";
@@ -1266,7 +1235,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
protected String getServerId(final String host, final Integer port) {
String serverHost = (host != null ? host : getLocalHost());
- String serverPort = StringUtils.valueOf(port, String.valueOf(CacheServer.DEFAULT_PORT));
+ String serverPort = StringUtils.defaultString(port, String.valueOf(CacheServer.DEFAULT_PORT));
return serverHost.concat("[").concat(serverPort).concat("]");
}
@@ -1287,31 +1256,24 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliMetaData(shellOnly = true,
relatedTopic = {CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE})
public Result startServer(
- @CliOption(key = CliStrings.START_SERVER__NAME, mandatory = false,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
+ @CliOption(key = CliStrings.START_SERVER__NAME,
help = CliStrings.START_SERVER__NAME__HELP) String memberName,
@CliOption(key = CliStrings.START_SERVER__ASSIGN_BUCKETS, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__ASSIGN_BUCKETS__HELP) final Boolean assignBuckets,
@CliOption(key = CliStrings.START_SERVER__BIND_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__BIND_ADDRESS__HELP) final String bindAddress,
@CliOption(key = CliStrings.START_SERVER__CACHE_XML_FILE,
optionContext = ConverterHint.FILE_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__CACHE_XML_FILE__HELP) String cacheXmlPathname,
@CliOption(key = CliStrings.START_SERVER__CLASSPATH,
/* optionContext = ConverterHint.FILE_PATH, // there's an issue with TAB here */
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__CLASSPATH__HELP) final String classpath,
@CliOption(key = CliStrings.START_SERVER__CRITICAL__HEAP__PERCENTAGE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__CRITICAL__HEAP__HELP) final Float criticalHeapPercentage,
@CliOption(key = CliStrings.START_SERVER__CRITICAL_OFF_HEAP_PERCENTAGE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__CRITICAL_OFF_HEAP__HELP) final Float criticalOffHeapPercentage,
@CliOption(key = CliStrings.START_SERVER__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__DIR__HELP) String workingDirectory,
@CliOption(key = CliStrings.START_SERVER__DISABLE_DEFAULT_SERVER,
unspecifiedDefaultValue = "false", specifiedDefaultValue = "true",
@@ -1320,98 +1282,70 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
unspecifiedDefaultValue = "false", specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__DISABLE_EXIT_WHEN_OUT_OF_MEMORY_HELP) final Boolean disableExitWhenOutOfMemory,
@CliOption(key = CliStrings.START_SERVER__ENABLE_TIME_STATISTICS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__ENABLE_TIME_STATISTICS__HELP) final Boolean enableTimeStatistics,
@CliOption(key = CliStrings.START_SERVER__EVICTION__HEAP__PERCENTAGE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__EVICTION__HEAP__PERCENTAGE__HELP) final Float evictionHeapPercentage,
@CliOption(key = CliStrings.START_SERVER__EVICTION_OFF_HEAP_PERCENTAGE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__EVICTION_OFF_HEAP_PERCENTAGE__HELP) final Float evictionOffHeapPercentage,
@CliOption(key = CliStrings.START_SERVER__FORCE, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__FORCE__HELP) final Boolean force,
@CliOption(key = CliStrings.START_SERVER__GROUP, optionContext = ConverterHint.MEMBERGROUP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__GROUP__HELP) final String group,
@CliOption(key = CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS__HELP) final String hostNameForClients,
@CliOption(key = CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH,
specifiedDefaultValue = "true", unspecifiedDefaultValue = "false",
help = CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH__HELP) final Boolean includeSystemClasspath,
@CliOption(key = CliStrings.START_SERVER__INITIAL_HEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__INITIAL_HEAP__HELP) final String initialHeap,
@CliOption(key = CliStrings.START_SERVER__J,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__J__HELP) final String[] jvmArgsOpts,
@CliOption(key = CliStrings.START_SERVER__LOCATORS,
optionContext = ConverterHint.LOCATOR_DISCOVERY_CONFIG,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__LOCATORS__HELP) final String locators,
@CliOption(key = CliStrings.START_SERVER__LOCATOR_WAIT_TIME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__LOCATOR_WAIT_TIME_HELP) final Integer locatorWaitTime,
- @CliOption(key = CliStrings.START_SERVER__LOCK_MEMORY,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "true",
+ @CliOption(key = CliStrings.START_SERVER__LOCK_MEMORY, specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__LOCK_MEMORY__HELP) final Boolean lockMemory,
@CliOption(key = CliStrings.START_SERVER__LOG_LEVEL, optionContext = ConverterHint.LOG_LEVEL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__LOG_LEVEL__HELP) final String logLevel,
@CliOption(key = CliStrings.START_SERVER__MAX__CONNECTIONS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MAX__CONNECTIONS__HELP) final Integer maxConnections,
@CliOption(key = CliStrings.START_SERVER__MAXHEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MAXHEAP__HELP) final String maxHeap,
@CliOption(key = CliStrings.START_SERVER__MAX__MESSAGE__COUNT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MAX__MESSAGE__COUNT__HELP) final Integer maxMessageCount,
@CliOption(key = CliStrings.START_SERVER__MAX__THREADS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MAX__THREADS__HELP) final Integer maxThreads,
@CliOption(key = CliStrings.START_SERVER__MCAST_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MCAST_ADDRESS__HELP) final String mcastBindAddress,
@CliOption(key = CliStrings.START_SERVER__MCAST_PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MCAST_PORT__HELP) final Integer mcastPort,
@CliOption(key = CliStrings.START_SERVER__MEMCACHED_PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MEMCACHED_PORT__HELP) final Integer memcachedPort,
@CliOption(key = CliStrings.START_SERVER__MEMCACHED_PROTOCOL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MEMCACHED_PROTOCOL__HELP) final String memcachedProtocol,
@CliOption(key = CliStrings.START_SERVER__MEMCACHED_BIND_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MEMCACHED_BIND_ADDRESS__HELP) final String memcachedBindAddress,
@CliOption(key = CliStrings.START_SERVER__REDIS_PORT,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__REDIS_PORT__HELP) final Integer redisPort,
@CliOption(key = CliStrings.START_SERVER__REDIS_BIND_ADDRESS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__REDIS_BIND_ADDRESS__HELP) final String redisBindAddress,
@CliOption(key = CliStrings.START_SERVER__REDIS_PASSWORD,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__REDIS_PASSWORD__HELP) final String redisPassword,
@CliOption(key = CliStrings.START_SERVER__MESSAGE__TIME__TO__LIVE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__MESSAGE__TIME__TO__LIVE__HELP) final Integer messageTimeToLive,
@CliOption(key = CliStrings.START_SERVER__OFF_HEAP_MEMORY_SIZE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__OFF_HEAP_MEMORY_SIZE__HELP) final String offHeapMemorySize,
@CliOption(key = CliStrings.START_SERVER__PROPERTIES, optionContext = ConverterHint.FILE_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__PROPERTIES__HELP) String gemfirePropertiesPathname,
@CliOption(key = CliStrings.START_SERVER__REBALANCE, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__REBALANCE__HELP) final Boolean rebalance,
@CliOption(key = CliStrings.START_SERVER__SECURITY_PROPERTIES,
optionContext = ConverterHint.FILE_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__SECURITY_PROPERTIES__HELP) String gemfireSecurityPropertiesPathname,
@CliOption(key = CliStrings.START_SERVER__SERVER_BIND_ADDRESS,
unspecifiedDefaultValue = CacheServer.DEFAULT_BIND_ADDRESS,
@@ -1420,13 +1354,10 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
unspecifiedDefaultValue = ("" + CacheServer.DEFAULT_PORT),
help = CliStrings.START_SERVER__SERVER_PORT__HELP) final Integer serverPort,
@CliOption(key = CliStrings.START_SERVER__SOCKET__BUFFER__SIZE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__SOCKET__BUFFER__SIZE__HELP) final Integer socketBufferSize,
@CliOption(key = CliStrings.START_SERVER__SPRING_XML_LOCATION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__SPRING_XML_LOCATION_HELP) final String springXmlLocation,
@CliOption(key = CliStrings.START_SERVER__STATISTIC_ARCHIVE_FILE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_SERVER__STATISTIC_ARCHIVE_FILE__HELP) final String statisticsArchivePathname,
@CliOption(key = CliStrings.START_SERVER__USE_CLUSTER_CONFIGURATION,
unspecifiedDefaultValue = "true", specifiedDefaultValue = "true",
@@ -1452,7 +1383,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
// prompt for password is username is specified in the command
- if (!StringUtils.isBlank(userName)) {
+ if (StringUtils.isNotBlank(userName)) {
if (StringUtils.isBlank(passwordToUse)) {
passwordToUse = getGfsh().readPassword(START_SERVER__PASSWORD + ": ");
}
@@ -1466,24 +1397,25 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
cacheXmlPathname = CliUtil.resolvePathname(cacheXmlPathname);
- if (!StringUtils.isBlank(cacheXmlPathname) && !IOUtils.isExistingPathname(cacheXmlPathname)) {
+ if (StringUtils.isNotBlank(cacheXmlPathname)
+ && !IOUtils.isExistingPathname(cacheXmlPathname)) {
return ResultBuilder.createUserErrorResult(
CliStrings.format(CliStrings.CACHE_XML_NOT_FOUND_MESSAGE, cacheXmlPathname));
}
gemfirePropertiesPathname = CliUtil.resolvePathname(gemfirePropertiesPathname);
- if (!StringUtils.isBlank(gemfirePropertiesPathname)
+ if (StringUtils.isNotBlank(gemfirePropertiesPathname)
&& !IOUtils.isExistingPathname(gemfirePropertiesPathname)) {
return ResultBuilder.createUserErrorResult(
- CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
- StringUtils.EMPTY_STRING, gemfirePropertiesPathname));
+ CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY,
+ gemfirePropertiesPathname));
}
gemfireSecurityPropertiesPathname =
CliUtil.resolvePathname(gemfireSecurityPropertiesPathname);
- if (!StringUtils.isBlank(gemfireSecurityPropertiesPathname)
+ if (StringUtils.isNotBlank(gemfireSecurityPropertiesPathname)
&& !IOUtils.isExistingPathname(gemfireSecurityPropertiesPathname)) {
return ResultBuilder.createUserErrorResult(
CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
@@ -1496,52 +1428,39 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
Properties gemfireProperties = new Properties();
- gemfireProperties.setProperty(BIND_ADDRESS,
- StringUtils.valueOf(bindAddress, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(CACHE_XML_FILE,
- StringUtils.valueOf(cacheXmlPathname, StringUtils.EMPTY_STRING));
+ gemfireProperties.setProperty(BIND_ADDRESS, StringUtils.defaultString(bindAddress));
+ gemfireProperties.setProperty(CACHE_XML_FILE, StringUtils.defaultString(cacheXmlPathname));
gemfireProperties.setProperty(ENABLE_TIME_STATISTICS,
- StringUtils.valueOf(enableTimeStatistics, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(GROUPS, StringUtils.valueOf(group, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(LOCATORS,
- StringUtils.valueOf(locators, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(LOCATOR_WAIT_TIME,
- StringUtils.valueOf(locatorWaitTime, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(LOG_LEVEL,
- StringUtils.valueOf(logLevel, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(MCAST_ADDRESS,
- StringUtils.valueOf(mcastBindAddress, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(MCAST_PORT,
- StringUtils.valueOf(mcastPort, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(MEMCACHED_PORT,
- StringUtils.valueOf(memcachedPort, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(enableTimeStatistics));
+ gemfireProperties.setProperty(GROUPS, StringUtils.defaultString(group));
+ gemfireProperties.setProperty(LOCATORS, StringUtils.defaultString(locators));
+ gemfireProperties.setProperty(LOCATOR_WAIT_TIME, StringUtils.defaultString(locatorWaitTime));
+ gemfireProperties.setProperty(LOG_LEVEL, StringUtils.defaultString(logLevel));
+ gemfireProperties.setProperty(MCAST_ADDRESS, StringUtils.defaultString(mcastBindAddress));
+ gemfireProperties.setProperty(MCAST_PORT, StringUtils.defaultString(mcastPort));
+ gemfireProperties.setProperty(MEMCACHED_PORT, StringUtils.defaultString(memcachedPort));
gemfireProperties.setProperty(MEMCACHED_PROTOCOL,
- StringUtils.valueOf(memcachedProtocol, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(memcachedProtocol));
gemfireProperties.setProperty(MEMCACHED_BIND_ADDRESS,
- StringUtils.valueOf(memcachedBindAddress, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(REDIS_PORT,
- StringUtils.valueOf(redisPort, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(memcachedBindAddress));
+ gemfireProperties.setProperty(REDIS_PORT, StringUtils.defaultString(redisPort));
gemfireProperties.setProperty(REDIS_BIND_ADDRESS,
- StringUtils.valueOf(redisBindAddress, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(REDIS_PASSWORD,
- StringUtils.valueOf(redisPassword, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(redisBindAddress));
+ gemfireProperties.setProperty(REDIS_PASSWORD, StringUtils.defaultString(redisPassword));
gemfireProperties.setProperty(STATISTIC_ARCHIVE_FILE,
- StringUtils.valueOf(statisticsArchivePathname, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(statisticsArchivePathname));
gemfireProperties.setProperty(USE_CLUSTER_CONFIGURATION,
- StringUtils.valueOf(requestSharedConfiguration, Boolean.TRUE.toString()));
- gemfireProperties.setProperty(LOCK_MEMORY,
- StringUtils.valueOf(lockMemory, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(requestSharedConfiguration, Boolean.TRUE.toString()));
+ gemfireProperties.setProperty(LOCK_MEMORY, StringUtils.defaultString(lockMemory));
gemfireProperties.setProperty(OFF_HEAP_MEMORY_SIZE,
- StringUtils.valueOf(offHeapMemorySize, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(START_DEV_REST_API,
- StringUtils.valueOf(startRestApi, StringUtils.EMPTY_STRING));
- gemfireProperties.setProperty(HTTP_SERVICE_PORT,
- StringUtils.valueOf(httpServicePort, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(offHeapMemorySize));
+ gemfireProperties.setProperty(START_DEV_REST_API, StringUtils.defaultString(startRestApi));
+ gemfireProperties.setProperty(HTTP_SERVICE_PORT, StringUtils.defaultString(httpServicePort));
gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS,
- StringUtils.valueOf(httpServiceBindAddress, StringUtils.EMPTY_STRING));
+ StringUtils.defaultString(httpServiceBindAddress));
// if username is specified in the command line, it will overwrite what's set in the
// properties file
- if (!StringUtils.isBlank(userName)) {
+ if (StringUtils.isNotBlank(userName)) {
gemfireProperties.setProperty(ResourceConstants.USER_NAME, userName);
gemfireProperties.setProperty(ResourceConstants.PASSWORD, passwordToUse);
}
@@ -1552,9 +1471,9 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
final boolean redirectOutput =
Boolean.getBoolean(OSProcess.ENABLE_OUTPUT_REDIRECTION_PROPERTY);
- ServerLauncher serverLauncher = new ServerLauncher.Builder().setAssignBuckets(assignBuckets)
- .setDisableDefaultServer(disableDefaultServer).setForce(force).setMemberName(memberName)
- .setRebalance(rebalance).setRedirectOutput(redirectOutput)
+ ServerLauncher.Builder serverLauncherBuilder = new ServerLauncher.Builder()
+ .setAssignBuckets(assignBuckets).setDisableDefaultServer(disableDefaultServer)
+ .setForce(force).setRebalance(rebalance).setRedirectOutput(redirectOutput)
.setServerBindAddress(serverBindAddress).setServerPort(serverPort)
.setSpringXmlLocation(springXmlLocation).setWorkingDirectory(workingDirectory)
.setCriticalHeapPercentage(criticalHeapPercentage)
@@ -1562,8 +1481,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
.setCriticalOffHeapPercentage(criticalOffHeapPercentage)
.setEvictionOffHeapPercentage(evictionOffHeapPercentage).setMaxConnections(maxConnections)
.setMaxMessageCount(maxMessageCount).setMaxThreads(maxThreads)
- .setMessageTimeToLive(messageTimeToLive).setSocketBufferSize(socketBufferSize)
- .setHostNameForClients(hostNameForClients).build();
+ .setMessageTimeToLive(messageTimeToLive).setSocketBufferSize(socketBufferSize);
+ if (hostNameForClients != null) {
+ serverLauncherBuilder.setHostNameForClients(hostNameForClients);
+ }
+ if (memberName != null) {
+ serverLauncherBuilder.setMemberName(memberName);
+ }
+ ServerLauncher serverLauncher = serverLauncherBuilder.build();
String[] serverCommandLine = createStartServerCommandLine(serverLauncher,
gemfirePropertiesPathname, gemfireSecurityPropertiesPathname, gemfireProperties,
@@ -1571,7 +1496,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
maxHeap);
if (getGfsh().getDebug()) {
- getGfsh().logInfo(StringUtils.concat(serverCommandLine, " "), null);
+ getGfsh().logInfo(StringUtils.join(serverCommandLine, StringUtils.SPACE), null);
}
Process serverProcess = new ProcessBuilder(serverCommandLine)
@@ -1722,7 +1647,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
commandLine.add(ServerLauncher.class.getName());
commandLine.add(ServerLauncher.Command.START.getName());
- if (!StringUtils.isBlank(launcher.getMemberName())) {
+ if (StringUtils.isNotBlank(launcher.getMemberName())) {
commandLine.add(launcher.getMemberName());
}
@@ -1847,16 +1772,13 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
relatedTopic = {CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE})
public Result statusServer(
@CliOption(key = CliStrings.STATUS_SERVER__MEMBER, optionContext = ConverterHint.MEMBERIDNAME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_SERVER__MEMBER__HELP) final String member,
@CliOption(key = CliStrings.STATUS_SERVER__PID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_SERVER__PID__HELP) final Integer pid,
@CliOption(key = CliStrings.STATUS_SERVER__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STATUS_SERVER__DIR__HELP) final String workingDirectory) {
try {
- if (!StringUtils.isBlank(member)) {
+ if (StringUtils.isNotBlank(member)) {
if (isConnectedAndReady()) {
final MemberMXBean serverProxy = getMemberMXBean(member);
@@ -1886,9 +1808,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
return ResultBuilder.createInfoResult(status.toString());
}
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
return ResultBuilder.createUserErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -1905,18 +1825,15 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
relatedTopic = {CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE})
public Result stopServer(
@CliOption(key = CliStrings.STOP_SERVER__MEMBER, optionContext = ConverterHint.MEMBERIDNAME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_SERVER__MEMBER__HELP) final String member,
@CliOption(key = CliStrings.STOP_SERVER__PID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_SERVER__PID__HELP) final Integer pid,
@CliOption(key = CliStrings.STOP_SERVER__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.STOP_SERVER__DIR__HELP) final String workingDirectory) {
ServerState serverState;
try {
- if (!StringUtils.isBlank(member)) {
+ if (StringUtils.isNotBlank(member)) {
if (isConnectedAndReady()) {
final MemberMXBean serverProxy = getMemberMXBean(member);
@@ -1963,13 +1880,11 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
}
- return ResultBuilder.createInfoResult(StringUtils.EMPTY_STRING);
+ return ResultBuilder.createInfoResult(StringUtils.EMPTY);
} else {
return ResultBuilder.createUserErrorResult(serverState.toString());
}
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
return ResultBuilder.createUserErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -1988,10 +1903,8 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
// CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_LIFECYCLE})
public Result startManager(
@CliOption(key = CliStrings.START_MANAGER__MEMBERNAME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__MEMBERNAME__HELP) String memberName,
@CliOption(key = CliStrings.START_MANAGER__DIR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__DIR__HELP) String dir,
@CliOption(key = CliStrings.START_MANAGER__PORT, unspecifiedDefaultValue = "1099",
help = CliStrings.START_MANAGER__PORT__HELP) int cacheServerPort,
@@ -1999,19 +1912,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
unspecifiedDefaultValue = "localhost",
help = CliStrings.START_MANAGER__BIND_ADDRESS__HELP) String cacheServerHost,
@CliOption(key = CliStrings.START_MANAGER__CLASSPATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__CLASSPATH__HELP) String classpath,
@CliOption(key = CliStrings.START_MANAGER__MAXHEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__MAXHEAP__HELP) String maxHeap,
@CliOption(key = CliStrings.START_MANAGER__INITIALHEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__INITIALHEAP__HELP) String initialHeap,
@CliOption(key = CliStrings.START_MANAGER__J,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__J__HELP) Map<String, String> systepProps,
@CliOption(key = CliStrings.START_MANAGER__GEODEPROPS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_MANAGER__GEODEPROPS__HELP) Map<String, String> gemfireProps) {
return ResultBuilder.createInfoResult("Not-implemented");
}
@@ -2026,13 +1934,11 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
unspecifiedDefaultValue = "false",
help = CliStrings.START_JCONSOLE__NOTILE__HELP) final boolean notile,
@CliOption(key = CliStrings.START_JCONSOLE__PLUGINPATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_JCONSOLE__PLUGINPATH__HELP) final String pluginpath,
@CliOption(key = CliStrings.START_JCONSOLE__VERSION, specifiedDefaultValue = "true",
unspecifiedDefaultValue = "false",
help = CliStrings.START_JCONSOLE__VERSION__HELP) final boolean version,
@CliOption(key = CliStrings.START_JCONSOLE__J,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_JCONSOLE__J__HELP) final List<String> jvmArgs) {
try {
String[] jconsoleCommandLine =
@@ -2064,18 +1970,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
String jconsoleProcessOutput = waitAndCaptureProcessStandardErrorStream(jconsoleProcess);
- if (!StringUtils.isBlank(jconsoleProcessOutput)) {
+ if (StringUtils.isNotBlank(jconsoleProcessOutput)) {
message.append(StringUtils.LINE_SEPARATOR);
message.append(jconsoleProcessOutput);
}
}
return ResultBuilder.createInfoResult(message.toString());
- } catch (GemFireException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (GemFireException | IllegalStateException | IllegalArgumentException e) {
return ResultBuilder.createShellClientErrorResult(e.getMessage());
} catch (IOException e) {
return ResultBuilder
@@ -2106,7 +2008,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
commandLine.add("-notile");
}
- if (!StringUtils.isBlank(pluginpath)) {
+ if (StringUtils.isNotBlank(pluginpath)) {
commandLine.add("-pluginpath " + pluginpath);
}
@@ -2118,7 +2020,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
String jmxServiceUrl = getJmxServiceUrlAsString(member);
- if (!StringUtils.isBlank(jmxServiceUrl)) {
+ if (StringUtils.isNotBlank(jmxServiceUrl)) {
commandLine.add(jmxServiceUrl);
}
}
@@ -2166,20 +2068,18 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
}
protected static String getExecutableSuffix() {
- return SystemUtils.isWindows() ? ".exe" : StringUtils.EMPTY_STRING;
+ return SystemUtils.isWindows() ? ".exe" : StringUtils.EMPTY;
}
protected String getJmxServiceUrlAsString(final String member) {
- if (!StringUtils.isBlank(member)) {
+ if (StringUtils.isNotBlank(member)) {
ConnectionEndpointConverter converter = new ConnectionEndpointConverter();
try {
ConnectionEndpoint connectionEndpoint =
converter.convertFromText(member, ConnectionEndpoint.class, null);
-
- return StringUtils.concat("service:jmx:rmi://", connectionEndpoint.getHost(), ":",
- connectionEndpoint.getPort(), "/jndi/rmi://", connectionEndpoint.getHost(), ":",
- connectionEndpoint.getPort(), "/jmxrmi");
+ String hostAndPort = connectionEndpoint.getHost() + ":" + connectionEndpoint.getPort();
+ return String.format("service:jmx:rmi://%s/jndi/rmi://%s/jmxrmi", hostAndPort, hostAndPort);
} catch (Exception e) {
throw new IllegalArgumentException(
CliStrings.START_JCONSOLE__CONNECT_BY_MEMBER_NAME_ID_ERROR_MESSAGE);
@@ -2201,7 +2101,6 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER,
CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M})
public Result startJVisualVM(@CliOption(key = CliStrings.START_JCONSOLE__J,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.START_JCONSOLE__J__HELP) final List<String> jvmArgs) {
try {
String[] jvisualvmCommandLine = createJVisualVMCommandLine(jvmArgs);
@@ -2219,17 +2118,13 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
InfoResultData infoResultData = ResultBuilder.createInfoResultData();
- if (!StringUtils.isBlank(jvisualvmProcessOutput)) {
+ if (StringUtils.isNotBlank(jvisualvmProcessOutput)) {
infoResultData.addLine(StringUtils.LINE_SEPARATOR);
infoResultData.addLine(jvisualvmProcessOutput);
}
return ResultBuilder.buildResult(infoResultData);
- } catch (GemFireException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (GemFireException | IllegalStateException | IllegalArgumentException e) {
return ResultBuilder.createShellClientErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -2285,7 +2180,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
unspecifiedDefaultValue = "http://localhost:7070/pulse",
help = CliStrings.START_PULSE__URL__HELP) final String url) {
try {
- if (!StringUtils.isBlank(url)) {
+ if (StringUtils.isNotBlank(url)) {
browse(URI.create(url));
return ResultBuilder.createInfoResult(CliStrings.START_PULSE__RUN);
} else {
@@ -2298,14 +2193,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
String pulseURL =
(String) operationInvoker.getAttribute(managerObjectName.toString(), "PulseURL");
- if (!StringUtils.isBlank(pulseURL)) {
+ if (StringUtils.isNotBlank(pulseURL)) {
browse(URI.create(pulseURL));
return ResultBuilder
.createInfoResult(CliStrings.START_PULSE__RUN + " with URL: " + pulseURL);
} else {
String pulseMessage = (String) operationInvoker
.getAttribute(managerObjectName.toString(), "StatusMessage");
- return (!StringUtils.isBlank(pulseMessage)
+ return (StringUtils.isNotBlank(pulseMessage)
? ResultBuilder.createGemFireErrorResult(pulseMessage)
: ResultBuilder.createGemFireErrorResult(CliStrings.START_PULSE__URL__NOTFOUND));
}
@@ -2314,8 +2209,6 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
.format(CliStrings.GFSH_MUST_BE_CONNECTED_FOR_LAUNCHING_0, "GemFire Pulse"));
}
}
- } catch (GemFireException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
} catch (Exception e) {
return ResultBuilder.createShellClientErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
@@ -2373,7 +2266,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
try {
String geodeHome = System.getenv("GEODE_HOME");
- assertState(!StringUtils.isBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
+ assertState(StringUtils.isNotBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
assertState(IOUtils.isExistingPathname(getPathToVsd()),
String.format(CliStrings.START_VSD__NOT_FOUND_ERROR_MESSAGE, geodeHome));
@@ -2393,19 +2286,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
InfoResultData infoResultData = ResultBuilder.createInfoResultData();
- if (!StringUtils.isBlank(vsdProcessOutput)) {
+ if (StringUtils.isNotBlank(vsdProcessOutput)) {
infoResultData.addLine(StringUtils.LINE_SEPARATOR);
infoResultData.addLine(vsdProcessOutput);
}
return ResultBuilder.buildResult(infoResultData);
- } catch (GemFireException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (FileNotFoundException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createShellClientErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (GemFireException | IllegalStateException | IllegalArgumentException
+ | FileNotFoundException e) {
return ResultBuilder.createShellClientErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
@@ -2489,7 +2377,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
try {
String geodeHome = System.getenv("GEODE_HOME");
- assertState(!StringUtils.isBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
+ assertState(StringUtils.isNotBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
if (isConnectedAndReady()
&& (getGfsh().getOperationInvoker() instanceof JmxOperationInvoker)) {
@@ -2518,7 +2406,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
InfoResultData infoResultData = ResultBuilder.createInfoResultData();
- if (!StringUtils.isBlank(dataBrowserProcessOutput)) {
+ if (StringUtils.isNotBlank(dataBrowserProcessOutput)) {
infoResultData.addLine(StringUtils.LINE_SEPARATOR);
infoResultData.addLine(dataBrowserProcessOutput);
}
@@ -2528,9 +2416,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
return ResultBuilder.createUserErrorResult(CliStrings.format(
CliStrings.GFSH_MUST_BE_CONNECTED_VIA_JMX_FOR_LAUNCHING_0, "GemFire DataBrowser"));
}
- } catch (IllegalArgumentException e) {
- return ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
return ResultBuilder.createUserErrorResult(e.getMessage());
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
index c9e79b0..ad344ff 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java
@@ -20,11 +20,11 @@ import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_P
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.lang.Initializer;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.internal.util.PasswordUtil;
@@ -181,7 +181,7 @@ public class ShellCommands implements CommandMarker {
if (locatorResponseException != null) {
String locatorResponseExceptionMessage = locatorResponseException.getMessage();
- locatorResponseExceptionMessage = (!StringUtils.isBlank(locatorResponseExceptionMessage)
+ locatorResponseExceptionMessage = (StringUtils.isNotBlank(locatorResponseExceptionMessage)
? locatorResponseExceptionMessage : locatorResponseException.toString());
exceptionMessage = "Exception caused JMX Manager startup to fail because: '"
.concat(locatorResponseExceptionMessage).concat("'");
@@ -560,7 +560,7 @@ public class ShellCommands implements CommandMarker {
try {
KeyManagerFactory keyManagerFactory = null;
- if (!StringUtils.isBlank(keystoreToUse)) {
+ if (StringUtils.isNotBlank(keystoreToUse)) {
KeyStore clientKeys = KeyStore.getInstance("JKS");
keyStoreStream = new FileInputStream(keystoreToUse);
clientKeys.load(keyStoreStream, keystorePasswordToUse.toCharArray());
@@ -572,7 +572,7 @@ public class ShellCommands implements CommandMarker {
// load server public key
TrustManagerFactory trustManagerFactory = null;
- if (!StringUtils.isBlank(truststoreToUse)) {
+ if (StringUtils.isNotBlank(truststoreToUse)) {
KeyStore serverPub = KeyStore.getInstance("JKS");
trustStoreStream = new FileInputStream(truststoreToUse);
serverPub.load(trustStoreStream, truststorePasswordToUse.toCharArray());
@@ -622,7 +622,7 @@ public class ShellCommands implements CommandMarker {
URL gfSecurityPropertiesUrl = null;
// Case 1: User has specified gfSecurity properties file
- if (!StringUtils.isBlank(gfSecurityPropertiesPathToUse)) {
+ if (StringUtils.isNotBlank(gfSecurityPropertiesPathToUse)) {
// User specified gfSecurity properties doesn't exist
if (!IOUtils.isExistingPathname(gfSecurityPropertiesPathToUse)) {
gfshInstance
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
index 3fadd96..d1e3f9e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/FilePathStringConverter.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.management.cli.ConverterHint;
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
index 59851da..20b37b3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/GatewaySenderIdConverter.java
@@ -14,20 +14,19 @@
*/
package org.apache.geode.management.internal.cli.converters;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.Converter;
import org.springframework.shell.core.MethodTarget;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
/**
*
* @since GemFire 7.0
@@ -64,7 +63,7 @@ public class GatewaySenderIdConverter implements Converter<String> {
Gfsh gfsh = Gfsh.getCurrentInstance();
if (gfsh != null && gfsh.isConnectedAndReady()) {
final String[] gatewaySenderIdArray = (String[]) gfsh.getOperationInvoker().invoke(
- ManagementConstants.OBJECTNAME__DISTRIBUTEDSYSTEM_MXBEAN, "listGatwaySenders",
+ ManagementConstants.OBJECTNAME__DISTRIBUTEDSYSTEM_MXBEAN, "listGatewaySenders",
new Object[0], new String[0]);
if (gatewaySenderIdArray != null && gatewaySenderIdArray.length != 0) {
gatewaySenderIds = new TreeSet<String>(Arrays.asList(gatewaySenderIdArray));
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
index b5d1b0c..d1a1107 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DiskStoreDetails.java
@@ -15,6 +15,11 @@
package org.apache.geode.management.internal.cli.domain;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.internal.lang.MutableIdentifiable;
+import org.apache.geode.internal.lang.ObjectUtils;
+
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -23,11 +28,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
-import org.apache.geode.cache.DiskStoreFactory;
-import org.apache.geode.internal.lang.MutableIdentifiable;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
-
/**
* The DiskStoreDetails class captures information about a particular disk store for a GemFire
* distributed system member. Each disk store for a member should be captured in separate instance
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
index 64bb512..335302e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/IndexDetails.java
@@ -15,13 +15,13 @@
package org.apache.geode.management.internal.cli.domain;
-import java.io.Serializable;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
+
+import java.io.Serializable;
/**
* The IndexDetails class encapsulates information for an Index on a Region in the GemFire Cache.
@@ -91,11 +91,11 @@ public class IndexDetails implements Comparable<IndexDetails>, Serializable {
}
public IndexDetails(final String memberId, final String regionPath, final String indexName) {
- assertValidArgument(!StringUtils.isBlank(memberId),
+ assertValidArgument(StringUtils.isNotBlank(memberId),
"The member having a region with an index must be specified!");
- assertValidArgument(!StringUtils.isBlank(regionPath),
+ assertValidArgument(StringUtils.isNotBlank(regionPath),
"The region in member (%1$s) with an index must be specified!", memberId);
- assertValidArgument(!StringUtils.isBlank(indexName),
+ assertValidArgument(StringUtils.isNotBlank(indexName),
"The name of the index on region (%1$s) of member (%2$s) must be specified!", regionPath,
memberId);
this.memberId = memberId;
@@ -307,7 +307,7 @@ public class IndexDetails implements Comparable<IndexDetails>, Serializable {
}
IndexType(final String description) {
- assertValidArgument(!StringUtils.isBlank(description),
+ assertValidArgument(StringUtils.isNotBlank(description),
"The description for the IndexType must be specified!");
this.description = description;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
index 4c241d0..68cc2e0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction.java
@@ -15,11 +15,7 @@
package org.apache.geode.management.internal.cli.functions;
-import java.io.File;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -35,14 +31,17 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
-
import org.apache.logging.log4j.Logger;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
/**
* The DescribeDiskStoreFunction class is an implementation of a GemFire Function used to collect
* information and details about a particular disk store for a particular GemFire distributed system
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
index 57d209b..c688d7a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
@@ -21,7 +22,6 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus;
public class FetchSharedConfigurationStatusFunction extends FunctionAdapter
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
index c99f84a..0811931 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
@@ -14,12 +14,7 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import java.util.Set;
-
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheListener;
@@ -38,6 +33,7 @@ import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.compression.Compressor;
+import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -48,6 +44,9 @@ import org.apache.geode.management.internal.cli.exceptions.CreateSubregionExcept
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.RegionPath;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Set;
/**
*
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
index 4383044..78879d3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/HelpBlock.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.cli.help;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.management.internal.cli.shell.Gfsh;
@@ -33,7 +33,7 @@ public class HelpBlock {
public HelpBlock() {}
public HelpBlock(String data) {
- if (!StringUtils.isBlank(data)) {
+ if (StringUtils.isNotBlank(data)) {
this.data = data;
this.level = 0;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
index 9dbf59c..3525013 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/help/Helper.java
@@ -231,7 +231,7 @@ public class Helper {
}
// Now comes the turn to display synopsis if any
- if (!StringUtils.isBlank(cliCommand.help())) {
+ if (StringUtils.isNotBlank(cliCommand.help())) {
HelpBlock synopsis = new HelpBlock(SYNOPSIS_NAME);
synopsis.addChild(new HelpBlock(cliCommand.help()));
root.addChild(synopsis);
@@ -259,7 +259,7 @@ public class Helper {
HelpBlock getOptionDetail(CliOption cliOption) {
HelpBlock optionNode = new HelpBlock(getPrimaryKey(cliOption));
String help = cliOption.help();
- optionNode.addChild(new HelpBlock((!StringUtils.isBlank(help) ? help : "")));
+ optionNode.addChild(new HelpBlock((StringUtils.isNotBlank(help) ? help : "")));
if (getSynonyms(cliOption).size() > 0) {
StringBuilder builder = new StringBuilder();
for (String string : getSynonyms(cliOption)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
index 9bd2bf9..6332540 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
@@ -14,15 +14,13 @@
*/
package org.apache.geode.management.internal.cli.result;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
+import java.util.Collection;
+import java.util.List;
+
/**
*
*
@@ -170,7 +168,7 @@ public class ResultBuilder {
}
public static <T extends CliJsonSerializable> ObjectResultData<T> createObjectResultData() {
- return new ObjectResultData<T>();
+ return new ObjectResultData<>();
}
// public static CatalogedResultData createCatalogedResultData() {
@@ -228,13 +226,13 @@ public class ResultBuilder {
* Bad Response.
*/
public static Result fromJson(String json) {
- Result result = null;
+ Result result;
try {
GfJsonObject jsonObject = new GfJsonObject(json);
String contentType = jsonObject.getString("contentType");
GfJsonObject data = jsonObject.getJSONObject("data");
- AbstractResultData resultData = null;
+ AbstractResultData resultData;
if (ResultData.TYPE_TABULAR.equals(contentType)) {
resultData = new TabularResultData(data);
} /*
@@ -247,7 +245,7 @@ public class ResultBuilder {
} else if (ResultData.TYPE_COMPOSITE.equals(contentType)) {
resultData = new CompositeResultData(data);
} else if (ResultData.TYPE_OBJECT.equals(contentType)) {
- resultData = new ObjectResultData<CliJsonSerializable>(data);
+ resultData = new ObjectResultData<>(data);
} else {
ErrorResultData errorResultData = new ErrorResultData();
errorResultData.addLine("Can not detect result type, unknown response format: " + json);
@@ -284,7 +282,7 @@ public class ResultBuilder {
* @return Read only ResultData of the same type
*/
static ResultData getReadOnlyResultData(ResultData resultData) {
- ResultData wrapperResultData = null;
+ ResultData wrapperResultData;
String contentType = resultData.getType();
if (ResultData.TYPE_TABULAR.equals(contentType)) {
wrapperResultData = new TabularResultData(resultData.getGfJsonObject()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
index da3c4ae..ff23512 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TableBuilder.java
@@ -53,12 +53,12 @@ package org.apache.geode.management.internal.cli.result;
*
* @since GemFire 7.0
*/
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.management.internal.cli.GfshParser;
+
import java.util.ArrayList;
import java.util.List;
-import org.apache.geode.management.internal.cli.GfshParser;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
public class TableBuilder {
public static Table newTable() {
@@ -66,7 +66,7 @@ public class TableBuilder {
}
public static class Table {
- private final List<RowGroup> rowGroups = new ArrayList<RowGroup>();
+ private final List<RowGroup> rowGroups = new ArrayList<>();
private String columnSeparator = " ";
private boolean isTabularResult = false;
@@ -138,7 +138,7 @@ public class TableBuilder {
}
public String buildTable() {
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
for (RowGroup rowGroup : this.rowGroups) {
stringBuffer.append(rowGroup.buildRowGroup(isTabularResult));
}
@@ -147,7 +147,7 @@ public class TableBuilder {
}
public List<String> buildTableList() {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (RowGroup rowGroup : this.rowGroups) {
list.add(rowGroup.buildRowGroup(isTabularResult));
}
@@ -169,7 +169,7 @@ public class TableBuilder {
*/
public static class RowGroup {
private final Table table;
- private final List<Row> rows = new ArrayList<Row>();
+ private final List<Row> rows = new ArrayList<>();
private int[] colSizes;
private String columnSeparator;
@@ -202,11 +202,11 @@ public class TableBuilder {
public String buildRowGroup(boolean isTabularResult) {
this.colSizes = computeColSizes(isTabularResult);
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
for (Row row : rows) {
String builtRow = row.buildRow(isTabularResult);
stringBuffer.append(builtRow);
- if (!builtRow.trim().isEmpty() || row.isBlank) {
+ if (StringUtils.isNotBlank(builtRow) || row.isBlank) {
stringBuffer.append(GfshParser.LINE_SEPARATOR);
}
}
@@ -275,7 +275,7 @@ public class TableBuilder {
public static class Row {
private final RowGroup rowGroup;
private final Character rowSeparator;
- private final List<Column> columns = new ArrayList<Column>();
+ private final List<Column> columns = new ArrayList<>();
boolean isBlank;
private boolean isTablewideSeparator;
@@ -335,7 +335,7 @@ public class TableBuilder {
}
private String buildRow(boolean isTabularResult) {
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
if (this.rowSeparator != null) {
if (isTablewideSeparator) {
int maxColLength = this.rowGroup.getTable().getMaxLength();
@@ -383,8 +383,8 @@ public class TableBuilder {
}
private static enum Align {
- LEFT, RIGHT, CENTER;
- };
+ LEFT, RIGHT, CENTER
+ }
private static class Column {
@@ -411,7 +411,7 @@ public class TableBuilder {
// This can happen because colSizes are re-computed
// to fit the screen width
if (this.stringValue.length() > colWidth) {
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
int endIndex = colWidth - 2;
if (endIndex < 0)
return "";
@@ -422,7 +422,7 @@ public class TableBuilder {
if (trimIt)
numSpaces = 0;
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
switch (align) {
case LEFT:
[43/69] [abbrv] geode git commit: GEODE-2934: fix typos
Posted by ud...@apache.org.
GEODE-2934: fix typos
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/52dadee3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/52dadee3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/52dadee3
Branch: refs/heads/feature/GEODE-2580
Commit: 52dadee32075e66cfc54de15611d3c0e3a816891
Parents: 9e5c75c
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 17 10:46:07 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 17 10:46:07 2017 -0700
----------------------------------------------------------------------
.../apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/52dadee3/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index ee61a85..dc73f04 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -114,7 +114,7 @@ public class AnalyzeSerializablesJUnitTest {
diffSortedClassesAndMethods(this.expectedDataSerializables, actualDataSerializables);
if (diff.length() > 0) {
System.out.println(
- "++++++++++++++++++++++++++++++testDataSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
+ "++++++++++++++++++++++++++++++testDataSerializables found discrepancies++++++++++++++++++++++++++++++++++++");
System.out.println(diff);
fail(
diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
@@ -134,7 +134,7 @@ public class AnalyzeSerializablesJUnitTest {
String diff = diffSortedClassesAndVariables(this.expectedSerializables, actualSerializables);
if (diff.length() > 0) {
System.out.println(
- "++++++++++++++++++++++++++++++testSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
+ "++++++++++++++++++++++++++++++testSerializables found discrepancies++++++++++++++++++++++++++++++++++++");
System.out.println(diff);
fail(
diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
[13/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java
index ac7d3c7..5712148 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,13 +64,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsLRURegionEntryOffHeapObjectKey
extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -67,6 +97,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +129,19 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +157,9 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +183,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,117 +194,121 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -275,7 +318,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -285,6 +328,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -293,7 +337,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -302,12 +346,12 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -320,14 +364,15 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -339,7 +384,10 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -356,6 +404,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -373,6 +422,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -402,6 +452,7 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -434,13 +485,19 @@ public class VersionedStatsLRURegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java
index 18954bc..410cbee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,9 +64,23 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsLRURegionEntryOffHeapStringKey1
extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -73,9 +99,11 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -84,6 +112,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -115,13 +144,19 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -137,7 +172,9 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -161,7 +198,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -172,117 +209,121 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -292,7 +333,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -302,6 +343,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -310,7 +352,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -319,12 +361,12 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -337,14 +379,15 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -356,7 +399,10 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -373,6 +419,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -390,6 +437,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -419,6 +467,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -451,8 +500,11 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -466,7 +518,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -485,6 +537,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -514,5 +567,8 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java
index 8ddbdc9..264aa02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,9 +64,23 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsLRURegionEntryOffHeapStringKey2
extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -85,9 +111,11 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -96,6 +124,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -127,13 +156,19 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -149,7 +184,9 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -173,7 +210,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -184,117 +221,121 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -304,7 +345,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -314,6 +355,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -322,7 +364,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -331,12 +373,12 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -349,14 +391,15 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -368,7 +411,10 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -385,6 +431,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -402,6 +449,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -431,6 +479,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -463,8 +512,11 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -483,7 +535,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -513,6 +565,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -555,5 +608,7 @@ public class VersionedStatsLRURegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
index d81fded..a96f381 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java
@@ -15,37 +15,50 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,14 +66,30 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsLRURegionEntryOffHeapUUIDKey
extends VersionedStatsLRURegionEntryOffHeap {
public VersionedStatsLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -69,6 +98,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -100,13 +130,19 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -122,7 +158,9 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -146,7 +184,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -157,117 +195,121 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -277,7 +319,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -287,6 +329,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryOffHeapUUIDKey.class,
"hitCount");
@@ -295,7 +338,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -304,12 +347,12 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -322,14 +365,15 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -341,7 +385,10 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -358,6 +405,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -375,6 +423,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -404,6 +453,7 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -436,13 +486,16 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -455,5 +508,8 @@ public class VersionedStatsLRURegionEntryOffHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java
index f04210e..a0dcca1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java
@@ -15,41 +15,69 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEntryHeap {
- public VersionedStatsRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VersionedStatsRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +85,11 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +109,7 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,21 +120,24 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -115,7 +147,7 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -125,13 +157,14 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -140,12 +173,12 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -158,14 +191,15 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -177,7 +211,10 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -194,6 +231,7 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -211,6 +249,7 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -240,6 +279,7 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -272,12 +312,17 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -288,5 +333,8 @@ public class VersionedStatsRegionEntryHeapIntKey extends VersionedStatsRegionEnt
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java
index 59657b0..4a4902e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java
@@ -15,41 +15,69 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEntryHeap {
- public VersionedStatsRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VersionedStatsRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +85,11 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +109,7 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,21 +120,24 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -115,7 +147,7 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -125,13 +157,14 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -140,12 +173,12 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -158,14 +191,15 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -177,7 +211,10 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -194,6 +231,7 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -211,6 +249,7 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -240,6 +279,7 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -272,12 +312,15 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -288,5 +331,8 @@ public class VersionedStatsRegionEntryHeapLongKey extends VersionedStatsRegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java
index a603b94..657306b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java
@@ -15,42 +15,69 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegionEntryHeap {
public VersionedStatsRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,10 +86,11 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -82,7 +110,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -93,21 +121,24 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -117,7 +148,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -127,6 +158,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapObjectKey.class,
"hitCount");
@@ -135,7 +167,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -144,12 +176,12 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -162,14 +194,15 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -181,7 +214,10 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -198,6 +234,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -215,6 +252,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -244,6 +282,7 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -276,13 +315,19 @@ public class VersionedStatsRegionEntryHeapObjectKey extends VersionedStatsRegion
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java
index 00eb20e..0a11afa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java
@@ -15,38 +15,61 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegionEntryHeap {
public VersionedStatsRegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -65,9 +88,11 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -76,10 +101,11 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
private static final AtomicLongFieldUpdater<VersionedStatsRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -99,7 +125,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -110,21 +136,24 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -134,7 +163,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -144,6 +173,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsRegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsRegionEntryHeapStringKey1.class,
"hitCount");
@@ -152,7 +182,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -161,12 +191,12 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -179,14 +209,15 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -198,7 +229,10 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -215,6 +249,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -232,6 +267,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -261,6 +297,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -293,8 +330,11 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -308,7 +348,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -327,6 +367,7 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -356,5 +397,8 @@ public class VersionedStatsRegionEntryHeapStringKey1 extends VersionedStatsRegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[50/69] [abbrv] geode git commit: GEODE-2938: Removed the deprecated
tag
Posted by ud...@apache.org.
GEODE-2938: Removed the deprecated tag
* Removed the deprecated tag in OrderByComparatorUnmapped.
* This code is still being used.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/da6c28c3
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/da6c28c3
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/da6c28c3
Branch: refs/heads/feature/GEODE-2580
Commit: da6c28c321f73903dc4849687710c347c16ade95
Parents: d9343d4
Author: nabarun <nn...@pivotal.io>
Authored: Thu May 18 10:55:38 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Thu May 18 10:55:38 2017 -0700
----------------------------------------------------------------------
.../geode/cache/query/internal/OrderByComparatorUnmapped.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/da6c28c3/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
index a695a42..db31df9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
@@ -29,7 +29,6 @@ import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.pdx.internal.PdxString;
-@Deprecated
public class OrderByComparatorUnmapped extends OrderByComparator {
private final Map<Object, Object[]> orderByMap;
[49/69] [abbrv] geode git commit: GEODE-2937: Restore
removeFromQueueOnException
Posted by ud...@apache.org.
GEODE-2937: Restore removeFromQueueOnException
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d9343d44
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d9343d44
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d9343d44
Branch: refs/heads/feature/GEODE-2580
Commit: d9343d4406ac2b0625a9acf40a7ec20d6ac2cf36
Parents: e216fde
Author: Jason Huynh <hu...@gmail.com>
Authored: Wed May 17 18:19:15 2017 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Thu May 18 10:35:29 2017 -0700
----------------------------------------------------------------------
.../cache/wan/AbstractGatewaySender.java | 14 +++++++++
.../AbstractGatewaySenderEventProcessor.java | 6 ++--
.../GatewaySenderEventCallbackDispatcher.java | 4 +--
.../cache/wan/GatewaySenderEventDispatcher.java | 2 +-
.../cache/wan/AsyncEventQueueTestBase.java | 26 +++++++++++++++
.../client/internal/GatewaySenderBatchOp.java | 16 ++++++----
.../cache/client/internal/SenderProxy.java | 6 ++--
.../wan/GatewaySenderEventRemoteDispatcher.java | 33 +++++++++++++++++---
8 files changed, 90 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 0ba40b4..7ed9b51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -640,6 +640,20 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return this.myDSId;
}
+ /**
+ * @param removeFromQueueOnException the removeFromQueueOnException to set
+ */
+ public void setRemoveFromQueueOnException(boolean removeFromQueueOnException) {
+ this.removeFromQueueOnException = removeFromQueueOnException;
+ }
+
+ /**
+ * @return the removeFromQueueOnException
+ */
+ public boolean isRemoveFromQueueOnException() {
+ return removeFromQueueOnException;
+ }
+
public CancelCriterion getStopper() {
return this.stopper;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 702438f..0c93755 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -606,7 +606,8 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
conflatedEventsToBeDispatched);
}
- boolean success = this.dispatcher.dispatchBatch(conflatedEventsToBeDispatched, false);
+ boolean success = this.dispatcher.dispatchBatch(conflatedEventsToBeDispatched,
+ sender.isRemoveFromQueueOnException(), false);
if (success) {
if (isDebugEnabled) {
logger.debug(
@@ -650,7 +651,8 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
} else {
handleUnSuccessfulBatchDispatch(events);
if (!resetLastPeekedEvents) {
- while (!this.dispatcher.dispatchBatch(conflatedEventsToBeDispatched, true)) {
+ while (!this.dispatcher.dispatchBatch(conflatedEventsToBeDispatched,
+ sender.isRemoveFromQueueOnException(), true)) {
if (isDebugEnabled) {
logger.debug(
"During normal processing, unsuccessfully dispatched {} events (batch #{})",
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
index eb3c735..efdd0ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
@@ -65,10 +65,10 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
* Dispatches a batch of messages to all registered <code>AsyncEventListener</code>s.
*
* @param events The <code>List</code> of events to send
- *
+ * @param removeFromQueueOnException Unused.
* @return whether the batch of messages was successfully processed
*/
- public boolean dispatchBatch(List events, boolean isRetry) {
+ public boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry) {
GatewaySenderStats statistics = this.eventProcessor.sender.getStatistics();
boolean success = false;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
index 807e386..5bb5333 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
@@ -22,7 +22,7 @@ import java.util.List;
*/
public interface GatewaySenderEventDispatcher {
- public boolean dispatchBatch(List events, boolean isRetry);
+ public boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry);
public boolean isRemoteDispatcher();
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 1595e99..5d4fd98 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -809,6 +809,32 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
+ statistics.getUnprocessedTokensAddedByPrimary()));
}
+ public static void setRemoveFromQueueOnException(String senderId, boolean removeFromQueue) {
+ Set<GatewaySender> senders = cache.getGatewaySenders();
+ GatewaySender sender = null;
+ for (GatewaySender s : senders) {
+ if (s.getId().equals(senderId)) {
+ sender = s;
+ break;
+ }
+ }
+ assertNotNull(sender);
+ ((AbstractGatewaySender) sender).setRemoveFromQueueOnException(removeFromQueue);
+ }
+
+ public static void unsetRemoveFromQueueOnException(String senderId) {
+ Set<GatewaySender> senders = cache.getGatewaySenders();
+ GatewaySender sender = null;
+ for (GatewaySender s : senders) {
+ if (s.getId().equals(senderId)) {
+ sender = s;
+ break;
+ }
+ }
+ assertNotNull(sender);
+ ((AbstractGatewaySender) sender).setRemoveFromQueueOnException(false);
+ }
+
public static void waitForSenderToBecomePrimary(String senderId) {
Set<GatewaySender> senders = ((GemFireCacheImpl) cache).getAllGatewaySenders();
final GatewaySender sender = getGatewaySenderById(senders, senderId);
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
index 7fc762fe6..b8616a9 100755
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/GatewaySenderBatchOp.java
@@ -48,18 +48,22 @@ public class GatewaySenderBatchOp {
* @param pool the pool to use to communicate with the server.
* @param events list of gateway events
* @param batchId the ID of this batch
+ * @param removeFromQueueOnException true if the events should be processed even after some
+ * exception
*/
public static void executeOn(Connection con, ExecutablePool pool, List events, int batchId,
- boolean isRetry) {
+ boolean removeFromQueueOnException, boolean isRetry) {
AbstractOp op = null;
// System.out.println("Version: "+con.getWanSiteVersion());
// Is this check even needed anymore? It looks like we just create the same exact op impl with
// the same parameters...
if (Version.GFE_651.compareTo(con.getWanSiteVersion()) >= 0) {
- op = new GatewaySenderGFEBatchOpImpl(events, batchId, con.getDistributedSystemId(), isRetry);
+ op = new GatewaySenderGFEBatchOpImpl(events, batchId, removeFromQueueOnException,
+ con.getDistributedSystemId(), isRetry);
} else {
// Default should create a batch of server version (ACCEPTOR.VERSION)
- op = new GatewaySenderGFEBatchOpImpl(events, batchId, con.getDistributedSystemId(), isRetry);
+ op = new GatewaySenderGFEBatchOpImpl(events, batchId, removeFromQueueOnException,
+ con.getDistributedSystemId(), isRetry);
}
pool.executeOn(con, op, true/* timeoutFatal */);
}
@@ -79,9 +83,9 @@ public class GatewaySenderBatchOp {
/**
* @throws org.apache.geode.SerializationException if serialization fails
*/
- public GatewaySenderGFEBatchOpImpl(List events, int batchId, int dsId, boolean isRetry) {
+ public GatewaySenderGFEBatchOpImpl(List events, int batchId, boolean removeFromQueueOnException,
+ int dsId, boolean isRetry) {
super(MessageType.GATEWAY_RECEIVER_COMMAND, calcPartCount(events));
- boolean removeFromQueueOnException = true;
if (isRetry) {
getMessage().setIsRetry();
}
@@ -258,7 +262,7 @@ public class GatewaySenderBatchOp {
List<BatchException70> l = (List<BatchException70>) part0.getObject();
if (logger.isDebugEnabled()) {
- logger.info(
+ logger.debug(
"We got an exception from the GatewayReceiver. MessageType : {} obj :{}",
msg.getMessageType(), obj);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
index 1ef9425..c6d283c 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/SenderProxy.java
@@ -29,8 +29,10 @@ public class SenderProxy extends ServerProxy {
super(pool);
}
- public void dispatchBatch_NewWAN(Connection con, List events, int batchId, boolean isRetry) {
- GatewaySenderBatchOp.executeOn(con, this.pool, events, batchId, isRetry);
+ public void dispatchBatch_NewWAN(Connection con, List events, int batchId,
+ boolean removeFromQueueOnException, boolean isRetry) {
+ GatewaySenderBatchOp.executeOn(con, this.pool, events, batchId, removeFromQueueOnException,
+ isRetry);
}
public Object receiveAckFromReceiver(Connection con) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d9343d44/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 3eec101..3a41972 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -140,7 +140,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
}
@Override
- public boolean dispatchBatch(List events, boolean isRetry) {
+ public boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry) {
GatewaySenderStats statistics = this.sender.getStatistics();
boolean success = false;
try {
@@ -212,7 +212,8 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
this.connectionLifeCycleLock.readLock().lock();
try {
if (connection != null) {
- sp.dispatchBatch_NewWAN(connection, events, currentBatchId, isRetry);
+ sp.dispatchBatch_NewWAN(connection, events, currentBatchId,
+ sender.isRemoveFromQueueOnException(), isRetry);
if (logger.isDebugEnabled()) {
logger.debug(
"{} : Dispatched batch (id={}) of {} events, queue size: {} on connection {}",
@@ -621,8 +622,32 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
// log batch exceptions and remove all the events if remove from
// exception is true
// do not remove if it is false
- logBatchExceptions(ack.getBatchException());
- processor.handleSuccessBatchAck(batchId);
+ if (sender.isRemoveFromQueueOnException()) {
+ // log the batchExceptions
+ logBatchExceptions(ack.getBatchException());
+ processor.handleSuccessBatchAck(batchId);
+ } else {
+ // we assume that batch exception will not occur for PDX related
+ // events
+ List<GatewaySenderEventImpl> pdxEvents =
+ processor.getBatchIdToPDXEventsMap().get(ack.getBatchException().getBatchId());
+ if (pdxEvents != null) {
+ for (GatewaySenderEventImpl senderEvent : pdxEvents) {
+ senderEvent.isAcked = true;
+ }
+ }
+ // log the batchExceptions
+ logBatchExceptions(ack.getBatchException());
+ // remove the events that have been processed.
+ BatchException70 be = ack.getBatchException();
+ List<BatchException70> exceptions = be.getExceptions();
+
+ for (int i = 0; i < exceptions.get(0).getIndex(); i++) {
+ processor.eventQueueRemove(1);
+ }
+ // reset the sender
+ processor.handleException();
+ }
} // unsuccessful batch
else { // The batch was successful.
[16/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
index 7bd9873..1819f83 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -15,37 +15,50 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,10 +66,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -87,9 +115,11 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -98,6 +128,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -129,13 +160,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -151,7 +188,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -175,7 +214,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -186,19 +225,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -215,7 +257,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -223,7 +265,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -248,7 +292,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -288,108 +331,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -399,7 +447,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -409,6 +457,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -417,7 +466,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -426,12 +475,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -444,14 +493,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -463,7 +513,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -480,6 +533,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -497,6 +551,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -526,6 +581,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -558,8 +614,11 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -578,7 +637,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -608,6 +667,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -650,5 +710,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 2f7d08e..2908587 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -15,38 +15,52 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -54,15 +68,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -71,6 +104,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -102,13 +136,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -124,7 +164,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -148,7 +190,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -159,19 +201,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -188,7 +233,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -196,7 +241,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -221,7 +268,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -261,108 +307,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -372,7 +423,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -382,6 +433,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.class,
"hitCount");
@@ -390,7 +442,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -399,12 +451,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -417,14 +469,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -436,7 +489,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -453,6 +509,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -470,6 +527,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -499,6 +557,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -531,13 +590,16 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -550,5 +612,8 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
index 340cac7..e38bf02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
@@ -15,45 +15,75 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapIntKey(RegionEntryContext context, int key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,10 +92,11 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +116,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,19 +127,22 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -118,7 +152,9 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -143,7 +179,6 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -183,10 +218,14 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -196,7 +235,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -206,6 +245,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapIntKey.class,
"hitCount");
@@ -214,7 +254,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -223,12 +263,12 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -241,14 +281,15 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -260,7 +301,10 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -277,6 +321,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -294,6 +339,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -323,6 +369,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -355,12 +402,17 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -371,5 +423,8 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
index 6a5842f..5bbba86 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
@@ -15,45 +15,75 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,10 +92,11 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +116,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,19 +127,22 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -118,7 +152,9 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -143,7 +179,6 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -183,10 +218,14 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -196,7 +235,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -206,6 +245,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapLongKey.class,
"hitCount");
@@ -214,7 +254,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -223,12 +263,12 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -241,14 +281,15 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -260,7 +301,10 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -277,6 +321,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -294,6 +339,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -323,6 +369,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -355,12 +402,15 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -371,5 +421,8 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
index 599fd62..4d8c7db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,10 +91,11 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +115,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,19 +126,22 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -118,7 +151,9 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -143,7 +178,6 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -183,10 +217,14 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -196,7 +234,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -206,6 +244,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapObjectKey.class,
"hitCount");
@@ -214,7 +253,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -223,12 +262,12 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -241,14 +280,15 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -260,7 +300,10 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -277,6 +320,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -294,6 +338,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -323,6 +368,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -355,13 +401,19 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
index 518ee29..9cfc32a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
@@ -15,41 +15,67 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -68,9 +94,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -79,10 +107,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -102,7 +131,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -113,19 +142,22 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -135,7 +167,9 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -160,7 +194,6 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -200,10 +233,14 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -213,7 +250,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -223,6 +260,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapStringKey1.class,
"hitCount");
@@ -231,7 +269,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -240,12 +278,12 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -258,14 +296,15 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -277,7 +316,10 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -294,6 +336,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -311,6 +354,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -340,6 +384,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -372,8 +417,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -387,7 +435,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -406,6 +454,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -435,5 +484,8 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
index de19cc0..bad1ad9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
@@ -15,23 +15,33 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -39,17 +49,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -80,9 +106,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -91,10 +119,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -114,7 +143,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -125,19 +154,22 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -147,7 +179,9 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -172,7 +206,6 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -212,10 +245,14 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -225,7 +262,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -235,6 +272,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapStringKey2.class,
"hitCount");
@@ -243,7 +281,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -252,12 +290,12 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -270,14 +308,15 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -289,7 +328,10 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -306,6 +348,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -323,6 +366,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -352,6 +396,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -384,8 +429,11 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -404,7 +452,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -434,6 +482,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -476,5 +525,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[30/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
index 3c68ab0..0a02001 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* Implementation of {@link StatAlertDefinition}, represents threshold as data range
*
*/
-public final class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl
+public class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl
implements DataSerializableFixedID {
private static final long serialVersionUID = -8555077820685711783L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
index c1414bb..506263c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* Implementation of {@link StatAlertDefinition} This provides the definition for multiple statistic
*
*/
-public final class MultiAttrDefinitionImpl implements StatAlertDefinition {
+public class MultiAttrDefinitionImpl implements StatAlertDefinition {
private static final long serialVersionUID = 2508805676076940969L;
protected String _name;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
index 0abf142..c0d0f47 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* Implementation of {@link StatAlertDefinition}, represents threshold as number
*
*/
-public final class NumberThresholdDecoratorImpl extends BaseDecoratorImpl
+public class NumberThresholdDecoratorImpl extends BaseDecoratorImpl
implements DataSerializableFixedID {
private static final long serialVersionUID = -1799140125261894306L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
index 32222f0..50df697 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* Implementation of {@link StatAlertDefinition} This provides the definition for single statistic
*
*/
-public final class SingleAttrDefinitionImpl implements StatAlertDefinition {
+public class SingleAttrDefinitionImpl implements StatAlertDefinition {
private static final long serialVersionUID = 3292417185742697896L;
protected String name;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
index 554455d..81011d3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
@@ -249,7 +249,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
this.versionVector = new DiskRegionVersionVector(ds.getDiskStoreID());
}
- public final long getId() {
+ public long getId() {
return this.id;
}
@@ -739,7 +739,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
this.readyForRecovery = false;
}
- public final boolean isReadyForRecovery() {
+ public boolean isReadyForRecovery() {
// better name for this method would be isRecovering
return this.readyForRecovery;
}
@@ -808,11 +808,11 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
* Returns true if this region maintains a backup of all its keys and values on disk. Returns
* false if only values that will not fit in memory are written to disk.
*/
- public final boolean isBackup() {
+ public boolean isBackup() {
return this.backup;
}
- protected final void setBackup(boolean v) {
+ protected void setBackup(boolean v) {
this.backup = v;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 a0e360f..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
@@ -390,7 +390,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
* @return The total allowable size of this maps entries.
*/
- protected final long getLimit() {
+ protected long getLimit() {
if (_getOwner() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) _getOwner();
return bucketRegion.getLimit();
@@ -398,7 +398,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
return _getLruList().stats().getLimit();
}
- public final LRUStatistics getLRUStatistics() {
+ public LRUStatistics getLRUStatistics() {
return _getLruList().stats();
}
@@ -408,7 +408,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
* @return The current size of all the entries.
*/
- protected final long getTotalEntrySize() {
+ protected long getTotalEntrySize() {
if (_getOwnerObject() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) _getOwner();
return bucketRegion.getCounter();
@@ -417,7 +417,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void lruUpdateCallback() {
+ public void lruUpdateCallback() {
final boolean isDebugEnabled_LRU = logger.isTraceEnabled(LogMarker.LRU);
if (getCallbackDisabled()) {
@@ -638,7 +638,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*/
// TODO this method acts as LRUupdateCallbacks
// do we need to put it here are insert one level up
- public final void updateStats() {
+ public void updateStats() {
final int delta = getDelta();
resetThreadLocals();
if (logger.isTraceEnabled(LogMarker.LRU)) {
@@ -652,7 +652,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final boolean disableLruUpdateCallback() {
+ public boolean disableLruUpdateCallback() {
if (getCallbackDisabled()) {
return false;
} else {
@@ -662,29 +662,29 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void enableLruUpdateCallback() {
+ public void enableLruUpdateCallback() {
setCallbackDisabled(false);
}
// TODO rebalancing these methods are new on the
// rebalancing branch but never used???
- public final void disableLruUpdateCallbackForInline() {
+ public void disableLruUpdateCallbackForInline() {
setCallbackDisabled(true);
}
- public final void enableLruUpdateCallbackForInline() {
+ public void enableLruUpdateCallbackForInline() {
setCallbackDisabled(false);
}
@Override
- public final void resetThreadLocals() {
+ public void resetThreadLocals() {
mustRemove.set(null);
lruDelta.set(null);
callbackDisabled.set(null);
}
@Override
- public final Set<VersionSource> clear(RegionVersionVector rvv) {
+ public Set<VersionSource> clear(RegionVersionVector rvv) {
_getLruList().clear(rvv);
return super.clear(rvv);
}
@@ -725,7 +725,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
*/
@Override
- protected final void lruEntryCreate(RegionEntry re) {
+ protected void lruEntryCreate(RegionEntry re) {
LRUEntry e = (LRUEntry) re;
// Assert.assertFalse(e._getValue() instanceof DiskEntry.RecoveredEntry)
if (logger.isTraceEnabled(LogMarker.LRU)) {
@@ -746,7 +746,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- protected final void lruEntryUpdate(RegionEntry re) {
+ protected void lruEntryUpdate(RegionEntry re) {
final LRUEntry e = (LRUEntry) re;
setDelta(e.updateEntrySize(_getCCHelper()));
if (logger.isDebugEnabled()) {
@@ -788,7 +788,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- protected final void lruEntryDestroy(RegionEntry re) {
+ protected void lruEntryDestroy(RegionEntry re) {
final LRUEntry e = (LRUEntry) re;
if (logger.isTraceEnabled(LogMarker.LRU)) {
logger.trace(LogMarker.LRU,
@@ -821,7 +821,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
* Called by DiskEntry.Helper.faultInValue
*/
@Override
- public final void lruEntryFaultIn(LRUEntry e) {
+ public void lruEntryFaultIn(LRUEntry e) {
if (logger.isDebugEnabled()) {
logger.debug("lruEntryFaultIn for key={} size={}", e.getKey(), e.getEntrySize());
}
@@ -841,7 +841,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final void decTxRefCount(RegionEntry re) {
+ public void decTxRefCount(RegionEntry re) {
LocalRegion lr = null;
if (_isOwnerALocalRegion()) {
lr = _getOwner();
@@ -850,7 +850,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
@Override
- public final boolean lruLimitExceeded(DiskRegionView drv) {
+ public boolean lruLimitExceeded(DiskRegionView drv) {
return _getCCHelper().lruLimitExceeded(_getLruList().stats(), drv);
}
@@ -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/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
index bdaf200..866ff03 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
@@ -54,29 +54,29 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt
}
@Override
- public final boolean fillInValue(LocalRegion r, InitialImageOperation.Entry entry,
+ public boolean fillInValue(LocalRegion r, InitialImageOperation.Entry entry,
ByteArrayDataInput in, DM mgr) {
return Helper.fillInValue(this, entry, r.getDiskRegion(), mgr, in, r);
}
@Override
- public final boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp) {
+ public boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp) {
return Helper.isOverflowedToDisk(this, r.getDiskRegion(), dp, r);
}
@Override
- public final Object getValue(RegionEntryContext context) {
+ public Object getValue(RegionEntryContext context) {
return Helper.faultInValue(this, (LocalRegion) context); // OFFHEAP returned to callers
}
@Override
@Retained
- public final Object getValueRetain(RegionEntryContext context) {
+ public Object getValueRetain(RegionEntryContext context) {
return Helper.faultInValueRetain(this, (LocalRegion) context);
}
@Override
- public final Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
+ public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
return Helper.getValueInVMOrDiskWithoutFaultIn(this, owner);
}
@@ -87,17 +87,17 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt
}
@Override
- public final Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException {
+ public Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException {
return Helper.getValueOnDisk(this, r.getDiskRegion());
}
@Override
- public final Object getSerializedValueOnDisk(LocalRegion r) throws EntryNotFoundException {
+ public Object getSerializedValueOnDisk(LocalRegion r) throws EntryNotFoundException {
return Helper.getSerializedValueOnDisk(this, r.getDiskRegion());
}
@Override
- public final Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException {
+ public Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException {
// @todo darrel if value is Token.REMOVED || Token.DESTROYED throw
// EntryNotFoundException
return Helper.getValueOnDiskOrBuffer(this, r.getDiskRegion(), r);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 0d03469..ac5fb37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -347,32 +347,32 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
EntryEventImpl clientEvent) throws TimeoutException, CacheLoaderException;
@Override
- public final void localDestroy(Object key) throws EntryNotFoundException {
+ public void localDestroy(Object key) throws EntryNotFoundException {
localDestroy(key, null);
}
@Override
- public final void destroyRegion() throws CacheWriterException, TimeoutException {
+ public void destroyRegion() throws CacheWriterException, TimeoutException {
destroyRegion(null);
}
@Override
- public final void invalidate(Object key) throws TimeoutException, EntryNotFoundException {
+ public void invalidate(Object key) throws TimeoutException, EntryNotFoundException {
invalidate(key, null);
}
@Override
- public final void localInvalidate(Object key) throws EntryNotFoundException {
+ public void localInvalidate(Object key) throws EntryNotFoundException {
localInvalidate(key, null);
}
@Override
- public final void localInvalidateRegion() {
+ public void localInvalidateRegion() {
localInvalidateRegion(null);
}
@Override
- public final void invalidateRegion() throws TimeoutException {
+ public void invalidateRegion() throws TimeoutException {
invalidateRegion(null);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 e0fc27c..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
@@ -152,23 +152,23 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Override
- public final void setEntryFactory(RegionEntryFactory f) {
+ public void setEntryFactory(RegionEntryFactory f) {
this.entryFactory = f;
}
- public final RegionEntryFactory getEntryFactory() {
+ public RegionEntryFactory getEntryFactory() {
return this.entryFactory;
}
- protected final void _setAttributes(Attributes a) {
+ protected void _setAttributes(Attributes a) {
this.attr = a;
}
- public final Attributes getAttributes() {
+ public Attributes getAttributes() {
return this.attr;
}
- protected final LocalRegion _getOwner() {
+ protected LocalRegion _getOwner() {
return (LocalRegion) this.owner;
}
@@ -176,19 +176,19 @@ public abstract class AbstractRegionMap implements RegionMap {
return this.owner instanceof LocalRegion;
}
- protected final Object _getOwnerObject() {
+ protected Object _getOwnerObject() {
return this.owner;
}
- public final void setOwner(Object r) {
+ public void setOwner(Object r) {
this.owner = r;
}
- protected final CustomEntryConcurrentHashMap<Object, Object> _getMap() {
+ protected CustomEntryConcurrentHashMap<Object, Object> _getMap() {
return this.map;
}
- protected final void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) {
+ protected void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) {
this.map = m;
}
@@ -221,7 +221,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return (Collection) _getMap().values();
}
- public final boolean containsKey(Object key) {
+ public boolean containsKey(Object key) {
RegionEntry re = getEntry(key);
if (re == null) {
return false;
@@ -243,12 +243,12 @@ public abstract class AbstractRegionMap implements RegionMap {
@Override
- public final RegionEntry getEntryInVM(Object key) {
+ public RegionEntry getEntryInVM(Object key) {
return (RegionEntry) _getMap().get(key);
}
- public final RegionEntry putEntryIfAbsent(Object key, RegionEntry re) {
+ public RegionEntry putEntryIfAbsent(Object key, RegionEntry re) {
RegionEntry oldRe = (RegionEntry) _getMap().putIfAbsent(key, re);
if (oldRe == null && (re instanceof OffHeapRegionEntry) && _isOwnerALocalRegion()
&& _getOwner().isThisRegionBeingClosedOrDestroyed()) {
@@ -265,13 +265,13 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Override
- public final RegionEntry getOperationalEntryInVM(Object key) {
+ public RegionEntry getOperationalEntryInVM(Object key) {
RegionEntry re = (RegionEntry) _getMap().get(key);
return re;
}
- public final void removeEntry(Object key, RegionEntry re, boolean updateStat) {
+ public void removeEntry(Object key, RegionEntry re, boolean updateStat) {
if (re.isTombstone() && _getMap().get(key) == re) {
logger.fatal(
LocalizedMessage.create(LocalizedStrings.AbstractRegionMap_ATTEMPT_TO_REMOVE_TOMBSTONE),
@@ -286,8 +286,8 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final 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(
@@ -304,7 +304,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- protected final void incEntryCount(int delta) {
+ protected void incEntryCount(int delta) {
LocalRegion lr = _getOwner();
if (lr != null) {
CachePerfStats stats = lr.getCachePerfStats();
@@ -314,7 +314,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- final void incClearCount(LocalRegion lr) {
+ void incClearCount(LocalRegion lr) {
if (lr != null && !(lr instanceof HARegion)) {
CachePerfStats stats = lr.getCachePerfStats();
if (stats != null) {
@@ -640,7 +640,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
@Retained // Region entry may contain an off-heap value
- public final RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
+ public RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
boolean needsCallback = false;
@Retained
RegionEntry newRe =
@@ -696,7 +696,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return newRe;
}
- public final RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
+ public RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) {
boolean needsCallback = false;
RegionEntry re = getEntry(key);
if (re == null) {
@@ -755,7 +755,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return re;
}
- public final boolean initialImagePut(final Object key, final long lastModified, Object newValue,
+ public boolean initialImagePut(final Object key, final long lastModified, Object newValue,
final boolean wasRecovered, boolean deferLRUCallback, VersionTag entryVersion,
InternalDistributedMember sender, boolean isSynchronizing) {
boolean result = false;
@@ -1023,7 +1023,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return true;
}
- public final boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI,
+ public boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI,
boolean cacheWrite, boolean isEviction, Object expectedOldValue, boolean removeRecoveredEntry)
throws CacheWriterException, EntryNotFoundException, TimeoutException {
@@ -1555,7 +1555,7 @@ public abstract class AbstractRegionMap implements RegionMap {
return false;
}
- public final void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent,
+ public void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent,
boolean inTokenMode, boolean inRI, Operation op, EventID eventId, Object aCallbackArgument,
List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo,
ClientProxyMembershipID bridgeContext, boolean isOriginRemote, TXEntryState txEntryState,
@@ -1858,8 +1858,8 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final 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 final 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();
@@ -3510,7 +3510,7 @@ public abstract class AbstractRegionMap implements RegionMap {
/** create a callback event for applying a transactional change to the local cache */
@Retained
- public static final EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key,
+ public static EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key,
Object newValue, TransactionId txId, TXRmtEvent txEvent, EventID eventId,
Object aCallbackArgument, FilterRoutingInfo filterRoutingInfo,
ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag,
@@ -3614,7 +3614,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void writeSyncIfPresent(Object key, Runnable runner) {
+ public void writeSyncIfPresent(Object key, Runnable runner) {
RegionEntry re = getEntry(key);
if (re != null) {
final boolean disabled = disableLruUpdateCallback();
@@ -3638,7 +3638,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void removeIfDestroyed(Object key) {
+ public void removeIfDestroyed(Object key) {
LocalRegion owner = _getOwner();
// boolean makeTombstones = owner.concurrencyChecksEnabled;
DiskRegion dr = owner.getDiskRegion();
@@ -3732,7 +3732,7 @@ public abstract class AbstractRegionMap implements RegionMap {
*
* @param entry the entry to attempt to add to the system
*/
- protected final RegionEntry putEntryIfAbsentForTest(RegionEntry entry) {
+ protected RegionEntry putEntryIfAbsentForTest(RegionEntry entry) {
return (RegionEntry) putEntryIfAbsent(entry.getKey(), entry);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index 26fdde5..14e276a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -82,7 +82,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
Boolean.getBoolean("GemFire.ALWAYS_REPLICATE_UPDATES");
/** @return whether we should do a local create for a remote one */
- private static final boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) {
+ private static boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) {
DataPolicy dp = rgn.getAttributes().getDataPolicy();
if (!rgn.isAllEvents() || (dp.withReplication() && rgn.isInitialized()
&& ev.getOperation().isUpdate() && !rgn.concurrencyChecksEnabled // misordered CREATE and
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index 7b35cb5..04a48d0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -842,7 +842,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
*
* @return the member who is primary for this bucket
*/
- public final InternalDistributedMember getPrimary() {
+ public InternalDistributedMember getPrimary() {
InternalDistributedMember primary = getExistingPrimary();
if (primary == null) {
primary = waitForNewPrimary();
@@ -857,7 +857,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* @see #getPrimary()
* @return the existing primary (if it is still in the view) otherwise null
*/
- private final InternalDistributedMember getExistingPrimary() {
+ private InternalDistributedMember getExistingPrimary() {
return basicGetPrimaryMember();
}
@@ -865,7 +865,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* If the current member is primary for this bucket return true, otherwise, give some time for the
* current member to become primary and then return whether it is a primary (true/false).
*/
- public final boolean isPrimaryWithWait() {
+ public boolean isPrimaryWithWait() {
if (this.isPrimary()) {
return true;
}
@@ -884,7 +884,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* @see #getPrimary()
* @return the new primary
*/
- private final InternalDistributedMember waitForNewPrimary() {
+ private InternalDistributedMember waitForNewPrimary() {
DM dm = this.regionAdvisor.getDistributionManager();
DistributionConfig config = dm.getConfig();
// failure detection period
@@ -2441,7 +2441,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
/**
* Profile information for a remote bucket hosted by cache servers.
*/
- public static final class ServerBucketProfile extends BucketProfile {
+ public static class ServerBucketProfile extends BucketProfile {
public Set<BucketServerLocation66> bucketServerLocations;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 62a9bc7..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
@@ -99,14 +99,14 @@ public class BucketRegion extends DistributedRegion implements Bucket {
*/
private final AtomicLongWithTerminalState bytesInMemory = new AtomicLongWithTerminalState();
- public static final class RawValue {
+ public static class RawValue {
private final Object rawValue;
public RawValue(Object rawVal) {
this.rawValue = rawVal;
}
- public final boolean isValueByteArray() {
+ public boolean isValueByteArray() {
return this.rawValue instanceof byte[];
}
@@ -1017,7 +1017,7 @@ public class BucketRegion extends DistributedRegion implements Bucket {
}
@Override
- final void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException {
+ void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException {
ExpiryTask task = expiryTask;
boolean isEvictDestroy = isEntryEvictDestroyEnabled();
// Fix for bug 43805 - get the primary lock before
@@ -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/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
index 104cf18..0c8f5fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java
@@ -52,19 +52,19 @@ public class BytesAndBitsForCompactor {
}
- public final StoredObject getOffHeapData() {
+ public StoredObject getOffHeapData() {
return this.offHeapData;
}
- public final byte[] getBytes() {
+ public byte[] getBytes() {
return this.data;
}
- public final byte getBits() {
+ public byte getBits() {
return this.userBits;
}
- public final int getValidLength() {
+ public int getValidLength() {
return this.validLength;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
index 033f530..701c93e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java
@@ -56,7 +56,7 @@ public class CacheObserverHolder {
/**
* Set the given observer to be notified of query events. Returns the current observer.
*/
- public static final CacheObserver setInstance(CacheObserver observer) {
+ public static CacheObserver setInstance(CacheObserver observer) {
if (observer == null)
observer = NO_OBSERVER;
CacheObserver oldObserver = _instance;
@@ -65,7 +65,7 @@ public class CacheObserverHolder {
}
/** Return the current QueryObserver instance */
- public static final CacheObserver getInstance() {
+ public static CacheObserver getInstance() {
return _instance;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 6bfb0f3..ab53ca4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -274,7 +274,7 @@ public class CacheServerLauncher {
public static final String EVICTION_OFF_HEAP_PERCENTAGE = "eviction-off-heap-percentage";
protected static final String LOCK_MEMORY = ConfigurationProperties.LOCK_MEMORY;
- protected final File processDirOption(final Map<String, Object> options, final String dirValue)
+ protected File processDirOption(final Map<String, Object> options, final String dirValue)
throws FileNotFoundException {
final File inputWorkingDirectory = new File(dirValue);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
index 2fef594..30168ff 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
*
* @since GemFire 5.1
*/
-public final class ClientRegionEventImpl extends RegionEventImpl {
+public class ClientRegionEventImpl extends RegionEventImpl {
/**
* The originating membershipId of this event.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
index 1aeb61b..3964cd7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java
@@ -38,7 +38,7 @@ public class ClientServerObserverHolder {
/**
* Set the given observer to be notified of events. Returns the current observer.
*/
- public static final ClientServerObserver setInstance(ClientServerObserver observer) {
+ public static ClientServerObserver setInstance(ClientServerObserver observer) {
Support.assertArg(observer != null, "setInstance expects a non-null argument!");
ClientServerObserver oldObserver = _instance;
_instance = observer;
@@ -46,7 +46,7 @@ public class ClientServerObserverHolder {
}
/** Return the current BridgeObserver instance */
- public static final ClientServerObserver getInstance() {
+ public static ClientServerObserver getInstance() {
return _instance;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
index 03ef99b..6fe459e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
@@ -35,8 +35,7 @@ import org.apache.geode.internal.logging.LogService;
*/
/** Creates a new instance of CloseCacheMessage */
-public final class CloseCacheMessage extends HighPriorityDistributionMessage
- implements MessageWithReply {
+public class CloseCacheMessage extends HighPriorityDistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
private int processorId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
index 815b526..c1d1e77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java
@@ -306,7 +306,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
}
}
- public static final class CreateRegionMessage extends HighPriorityDistributionMessage
+ public static class CreateRegionMessage extends HighPriorityDistributionMessage
implements MessageWithReply {
public boolean concurrencyChecksEnabled;
@@ -768,7 +768,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor {
}
}
- public static final class CreateRegionReplyMessage extends ReplyMessage {
+ public static class CreateRegionReplyMessage extends ReplyMessage {
protected CacheProfile profile;
protected ArrayList bucketProfiles;
protected Object eventState;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
index 5132ec0..ad3f976 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
@@ -217,7 +217,7 @@ public class DestroyOperation extends DistributedCacheOperation {
}
}
- public static final class DestroyWithContextMessage extends DestroyMessage {
+ public static class DestroyWithContextMessage extends DestroyMessage {
transient ClientProxyMembershipID context;
public DestroyWithContextMessage() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
index 5914ab5..0af8840 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java
@@ -57,7 +57,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.0
*/
-public final class DestroyPartitionedRegionMessage extends PartitionMessage {
+public class DestroyPartitionedRegionMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private Object cbArg;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
index 3cc988f..53efa4f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
@@ -466,12 +466,12 @@ public class DestroyRegionOperation extends DistributedCacheOperation {
}
}
- public static final class DestroyRegionWithContextMessage extends DestroyRegionMessage {
+ public static class DestroyRegionWithContextMessage extends DestroyRegionMessage {
protected transient Object context;
@Override
- final public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
+ public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
return new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg,
true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 f8b8289..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
@@ -205,7 +205,7 @@ public class DiskRegion extends AbstractDiskRegion {
}
@Override
- public final String getName() {
+ public String getName() {
return this.name;
}
@@ -239,11 +239,11 @@ public class DiskRegion extends AbstractDiskRegion {
* method does any work is when backup is true and recovery data was discovered when this disk
* region was created.
*/
- final void initializeOwner(LocalRegion drs) {
+ void initializeOwner(LocalRegion drs) {
getDiskStore().initializeOwner(drs);
}
- final void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) {
+ void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) {
if (isReadyForRecovery()) {
// this.scheduleCompaction();
if (GIIStatus.didFullGII(giiStatus)) {
@@ -332,7 +332,7 @@ public class DiskRegion extends AbstractDiskRegion {
});
}
- public final boolean isOverflowEnabled() {
+ public boolean isOverflowEnabled() {
return this.overflowEnabled;
}
@@ -345,7 +345,7 @@ public class DiskRegion extends AbstractDiskRegion {
* completed successfully, resulting in the put operation to abort.
* @throws IllegalArgumentException If <code>id</code> is less than zero
*/
- final void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async)
+ void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async)
throws RegionClearedException {
getDiskStore().put(region, entry, value, async);
}
@@ -356,7 +356,7 @@ public class DiskRegion extends AbstractDiskRegion {
*
* @see #getBytesAndBitsWithoutLock(DiskId, boolean, boolean)
*/
- final Object get(DiskId id) {
+ Object get(DiskId id) {
return getDiskStore().get(this, id);
}
@@ -368,25 +368,25 @@ public class DiskRegion extends AbstractDiskRegion {
* @param id DiskId object for the entry
* @return value of the entry
*/
- final BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) {
+ BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) {
return getDiskStore().getBytesAndBitsWithoutLock(this, id, faultIn, bitOnly);
}
/**
* @since GemFire 3.2.1
*/
- final BytesAndBits getBytesAndBits(DiskId id) {
+ BytesAndBits getBytesAndBits(DiskId id) {
return getBytesAndBits(id, true);
}
- final BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) {
+ BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) {
return getDiskStore().getBytesAndBits(this, id, faultingIn);
}
/**
* @since GemFire 3.2.1
*/
- final byte getBits(DiskId id) {
+ byte getBits(DiskId id) {
return getDiskStore().getBits(this, id);
}
@@ -401,7 +401,7 @@ public class DiskRegion extends AbstractDiskRegion {
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If <code>id</code> is less than zero, no action is taken.
*/
- public final Object getNoBuffer(DiskId id) {
+ public Object getNoBuffer(DiskId id) {
return getDiskStore().getNoBuffer(this, id);
}
@@ -413,11 +413,11 @@ public class DiskRegion extends AbstractDiskRegion {
* @throws IllegalArgumentException If <code>id</code> is {@linkplain #INVALID_ID invalid}or is
* less than zero, no action is taken.
*/
- final void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException {
+ void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException {
getDiskStore().remove(region, entry, false, false);
}
- final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
+ void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
throws RegionClearedException {
getDiskStore().remove(region, entry, async, isClear);
}
@@ -539,7 +539,7 @@ public class DiskRegion extends AbstractDiskRegion {
/**
* returns the active child
*/
- final Oplog testHook_getChild() {
+ Oplog testHook_getChild() {
return getDiskStore().persistentOplogs.getChild();
}
@@ -611,7 +611,7 @@ public class DiskRegion extends AbstractDiskRegion {
/** ThreadLocal to be used for maintaining consistency during clear* */
private final ThreadLocal<Integer> childReference = new ThreadLocal<Integer>();
- final void incClearCount() {
+ void incClearCount() {
this.clearCount.incrementAndGet();
}
@@ -733,7 +733,7 @@ public class DiskRegion extends AbstractDiskRegion {
return getOplogSet().getNextDir();
}
- final long newOplogEntryId() {
+ long newOplogEntryId() {
return getOplogSet().newOplogEntryId();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index aeabbbc..67fcce8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -593,7 +593,7 @@ public class DiskStoreImpl implements DiskStore {
* Initializes the contents of any regions on this DiskStore that have been registered but are not
* yet initialized.
*/
- final void initializeOwner(LocalRegion lr) {
+ void initializeOwner(LocalRegion lr) {
DiskRegion dr = lr.getDiskRegion();
// We don't need to do recovery for overflow regions.
if (!lr.getDataPolicy().withPersistence() || !dr.isRecreated()) {
@@ -686,7 +686,7 @@ public class DiskStoreImpl implements DiskStore {
* completed successfully, resulting in the put operation to abort.
* @throws IllegalArgumentException If {@code id} is less than zero
*/
- final void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async)
+ void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async)
throws RegionClearedException {
DiskRegion dr = region.getDiskRegion();
DiskId id = entry.getDiskId();
@@ -754,7 +754,7 @@ public class DiskStoreImpl implements DiskStore {
}
}
- final void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) {
+ void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) {
DiskRegion dr = region.getDiskRegion();
// this method will only be called by backup oplog
assert dr.isBackup();
@@ -792,7 +792,7 @@ public class DiskStoreImpl implements DiskStore {
* {@linkplain DiskRegionStats statistics}
*
*/
- final Object get(DiskRegion dr, DiskId id) {
+ Object get(DiskRegion dr, DiskId id) {
acquireReadLock(dr);
try {
int count = 0;
@@ -851,7 +851,7 @@ public class DiskStoreImpl implements DiskStore {
*
* @return an instance of BytesAndBits or Token.REMOVED_PHASE1
*/
- final Object getRaw(DiskRegionView dr, DiskId id) {
+ Object getRaw(DiskRegionView dr, DiskId id) {
if (dr.isRegionClosed()) {
throw new RegionDestroyedException(
LocalizedStrings.DiskRegion_THE_DISKREGION_HAS_BEEN_CLOSED_OR_DESTROYED
@@ -926,7 +926,7 @@ public class DiskStoreImpl implements DiskStore {
* @return value of the entry or CLEAR_BB if it is detected that the entry was removed by a
* concurrent region clear.
*/
- final BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn,
+ BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn,
boolean bitOnly) {
long oplogId = id.getOplogId();
OplogSet oplogSet = getOplogSet(dr);
@@ -943,7 +943,7 @@ public class DiskStoreImpl implements DiskStore {
return oplog.getBytesAndBits(dr, id, faultIn, bitOnly);
}
- final BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) {
+ BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) {
acquireReadLock(dr);
try {
if (dr.isRegionClosed()) {
@@ -977,7 +977,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* @since GemFire 3.2.1
*/
- final byte getBits(DiskRegion dr, DiskId id) {
+ byte getBits(DiskRegion dr, DiskId id) {
acquireReadLock(dr);
try {
if (dr.isRegionClosed()) {
@@ -1016,7 +1016,7 @@ public class DiskStoreImpl implements DiskStore {
* @return null if entry has nothing stored on disk (id == INVALID_ID)
* @throws IllegalArgumentException If {@code id} is less than zero, no action is taken.
*/
- public final Object getNoBuffer(DiskRegion dr, DiskId id) {
+ public Object getNoBuffer(DiskRegion dr, DiskId id) {
BytesAndBits bb = null;
acquireReadLock(dr);
try {
@@ -1055,7 +1055,7 @@ public class DiskStoreImpl implements DiskStore {
* @throws IllegalArgumentException If {@code id} is {@linkplain #INVALID_ID invalid}or is less
* than zero, no action is taken.
*/
- final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
+ void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear)
throws RegionClearedException {
DiskRegion dr = region.getDiskRegion();
if (!async) {
@@ -2009,7 +2009,7 @@ public class DiskStoreImpl implements DiskStore {
/**
* Reads the oplogs files and loads them into regions that are ready to be recovered.
*/
- public final void recoverRegionsThatAreReady() {
+ public void recoverRegionsThatAreReady() {
persistentOplogs.recoverRegionsThatAreReady();
}
@@ -2052,7 +2052,7 @@ public class DiskStoreImpl implements DiskStore {
private final boolean isCompactionPossible;
- final boolean isCompactionPossible() {
+ boolean isCompactionPossible() {
return this.isCompactionPossible;
}
@@ -2311,7 +2311,7 @@ public class DiskStoreImpl implements DiskStore {
}
}
- final DiskAccessException getDiskAccessException() {
+ DiskAccessException getDiskAccessException() {
return diskException.get();
}
@@ -4728,11 +4728,11 @@ public class DiskStoreImpl implements DiskStore {
oplogSet.updateDiskRegion(dr);
}
- public final Version getRecoveredGFVersion() {
+ public Version getRecoveredGFVersion() {
return getRecoveredGFVersion(this.initFile);
}
- final Version getRecoveredGFVersion(DiskInitFile initFile) {
+ Version getRecoveredGFVersion(DiskInitFile initFile) {
return initFile.currentRecoveredGFVersion();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
index a129eda..d5893d4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
@@ -34,7 +34,7 @@ import java.util.Properties;
* @since GemFire 5.1
*/
@SuppressWarnings({"deprecation", "unused"})
-public final class DiskWriteAttributesImpl implements DiskWriteAttributes {
+public class DiskWriteAttributesImpl implements DiskWriteAttributes {
private static final long serialVersionUID = -4269181954992768424L;
/** Are writes synchronous? */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
index be454e7..6411353 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
@@ -39,8 +39,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
*
*/
-public final class DistPeerTXStateStub extends PeerTXStateStub
- implements DistTXCoordinatorInterface {
+public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordinatorInterface {
private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null;
private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null;
private DistTXPrecommitMessage precommitDistTxMsg = null;
@@ -114,7 +113,7 @@ public final class DistPeerTXStateStub extends PeerTXStateStub
return primaryTransactionalOperations;
}
- private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
+ private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
if (logger.isDebugEnabled()) {
// [DISTTX] TODO Remove these
logger.debug("DistPeerTXStateStub.addPrimaryTransactionalOperations add " + dtop
@@ -129,7 +128,7 @@ public final class DistPeerTXStateStub extends PeerTXStateStub
}
@Override
- public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+ public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
throws UnsupportedOperationInTransactionException {
secondaryTransactionalOperations.add(dtop);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
index e22e1d9..be401b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
@@ -171,7 +171,7 @@ public class DistTXCommitMessage extends TXMessage {
* stub to the tx host. This is the reply to a {@link DistTXCommitMessage}.
*
*/
- public static final class DistTXCommitReplyMessage extends ReplyMessage {
+ public static class DistTXCommitReplyMessage extends ReplyMessage {
private transient TXCommitMessage commitMessage;
/**
@@ -274,7 +274,7 @@ public class DistTXCommitMessage extends TXMessage {
*
* [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
*/
- public static final class DistTxCommitReplyProcessor extends ReplyProcessor21 {
+ public static class DistTxCommitReplyProcessor extends ReplyProcessor21 {
private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
private Map<DistributedMember, TXCommitMessage> commitResponseMap;
private transient TXId txIdent = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
index 0ab2cc3..88e84f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
@@ -56,7 +56,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
*
*/
-public final class DistTXPrecommitMessage extends TXMessage {
+public class DistTXPrecommitMessage extends TXMessage {
private static final Logger logger = LogService.getLogger();
ArrayList<DistTxEntryEvent> secondaryTransactionalOperations;
@@ -175,7 +175,7 @@ public final class DistTXPrecommitMessage extends TXMessage {
/**
* This is the reply to a {@link DistTXPrecommitMessage}.
*/
- public static final class DistTXPrecommitReplyMessage extends ReplyMessage {
+ public static class DistTXPrecommitReplyMessage extends ReplyMessage {
private transient DistTxPrecommitResponse commitResponse;
/**
@@ -277,7 +277,7 @@ public final class DistTXPrecommitMessage extends TXMessage {
*
* [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
*/
- public static final class DistTxPrecommitReplyProcessor extends ReplyProcessor21 {
+ public static class DistTxPrecommitReplyProcessor extends ReplyProcessor21 {
private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
private Map<DistributedMember, DistTxPrecommitResponse> commitResponseMap;
private transient TXId txIdent = null;
@@ -465,7 +465,7 @@ public final class DistTXPrecommitMessage extends TXMessage {
}
}
- public static final class DistTxPrecommitResponse implements DataSerializableFixedID {
+ public static class DistTxPrecommitResponse implements DataSerializableFixedID {
private transient Boolean commitState;
private transient ArrayList<ArrayList<DistTxThinEntryState>> distTxEventList;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
index d4f5943..9438fc2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
*
*/
-public final class DistTXRollbackMessage extends TXMessage {
+public class DistTXRollbackMessage extends TXMessage {
private static final Logger logger = LogService.getLogger();
@@ -132,7 +132,7 @@ public final class DistTXRollbackMessage extends TXMessage {
/**
* This is the reply to a {@link DistTXRollbackMessage}.
*/
- public static final class DistTXRollbackReplyMessage extends ReplyMessage {
+ public static class DistTXRollbackReplyMessage extends ReplyMessage {
private transient Boolean rollbackState;
/**
@@ -283,7 +283,7 @@ public final class DistTXRollbackMessage extends TXMessage {
*
* [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
*/
- public static final class DistTxRollbackReplyProcessor extends ReplyProcessor21 {
+ public static class DistTxRollbackReplyProcessor extends ReplyProcessor21 {
private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
private Map<DistributedMember, Boolean> rollbackResponseMap;
private transient TXId txIdent = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
index a21e505..4517eb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java
@@ -31,8 +31,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
*
*/
-public final class DistTXStateOnCoordinator extends DistTXState
- implements DistTXCoordinatorInterface {
+public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoordinatorInterface {
private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null;
private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null;
@@ -46,12 +45,12 @@ public final class DistTXStateOnCoordinator extends DistTXState
secondaryTransactionalOperations = new ArrayList<DistTxEntryEvent>();
}
- public final ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
+ public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
throws UnsupportedOperationInTransactionException {
return primaryTransactionalOperations;
}
- private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
+ private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) {
if (logger.isDebugEnabled()) {
// [DISTTX] TODO Remove these
logger.debug("DistTXStateOnCoordinator.addPrimaryTransactionalOperations add " + dtop
@@ -75,7 +74,7 @@ public final class DistTXStateOnCoordinator extends DistTXState
}
}
- public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+ public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
throws UnsupportedOperationInTransactionException {
secondaryTransactionalOperations.add(dtop);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
index 7ba7d0c..6c33c65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
@@ -804,11 +804,11 @@ public abstract class DistributedCacheOperation {
return getRegion().scope.isAck();
}
- protected final DistributedRegion getRegion() {
+ protected DistributedRegion getRegion() {
return (DistributedRegion) this.event.getRegion();
}
- protected final EntryEventImpl getEvent() {
+ protected EntryEventImpl getEvent() {
return (EntryEventImpl) this.event;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
index 9d10fc1..b00612a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
@@ -262,13 +262,13 @@ public class DistributedClearOperation extends DistributedCacheOperation {
}
- public static final class ClearRegionWithContextMessage extends ClearRegionMessage {
+ public static class ClearRegionWithContextMessage extends ClearRegionMessage {
protected transient Object context;
protected RegionVersionVector rvv;
@Override
- final public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
+ public RegionEventImpl createRegionEvent(DistributedRegion rgn) {
ClientRegionEventImpl event = new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg,
true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 61542c4..c26cd56 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -268,7 +268,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
/**
* Data that represents a single entry being putall'd.
*/
- public static final class PutAllEntryData {
+ public static class PutAllEntryData {
final Object key;
@@ -398,7 +398,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out) throws IOException {
Object key = this.key;
final Object v = this.value;
DataSerializer.writeObject(key, out);
@@ -589,7 +589,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
}
}
- public static final class EntryVersionsList extends ArrayList<VersionTag>
+ public static class EntryVersionsList extends ArrayList<VersionTag>
implements DataSerializableFixedID, Externalizable {
public EntryVersionsList() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 41b2613..485835b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -1969,7 +1969,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
super.basicLocalClear(rEvent);
}
- public final DistributionConfig getDistributionConfig() {
+ public DistributionConfig getDistributionConfig() {
return getSystem().getDistributionManager().getConfig();
}
@@ -3544,7 +3544,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
* Implementation of {@link ProfileVisitor} that selects a random replicated member from the
* available ones for this region.
*/
- static final class GetRandomReplicate implements ProfileVisitor<DistributedMember> {
+ static class GetRandomReplicate implements ProfileVisitor<DistributedMember> {
private boolean onlyPersistent = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index 9d85008..870e778 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -399,7 +399,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR;
}
@@ -421,7 +421,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
return txUniqId;
}
- public final InternalDistributedMember getMemberToMasqueradeAs() {
+ public InternalDistributedMember getMemberToMasqueradeAs() {
if (txMemberId == null) {
return getSender();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 0c13b59..42bf10f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -254,7 +254,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
/**
* Data that represents a single entry being RemoveAll'd.
*/
- public static final class RemoveAllEntryData {
+ public static class RemoveAllEntryData {
final Object key;
@@ -369,7 +369,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
* {@link PutAllPRMessage#toData(DataOutput)} <br>
* {@link RemotePutAllMessage#toData(DataOutput)} <br>
*/
- public final void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out) throws IOException {
Object key = this.key;
DataSerializer.writeObject(key, out);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
index 76e9081..6d26c08 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java
@@ -61,7 +61,7 @@ public class EntriesSet extends AbstractSet {
this.allowTombstones = allowTombstones;
}
- protected final void checkTX() {
+ protected void checkTX() {
if (this.myTX != null) {
if (!myTX.isInProgress()) {
throw new IllegalStateException(
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 ac4954a..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
@@ -491,11 +491,11 @@ public class EntryEventImpl
return result;
}
- private final boolean testEventFlag(short mask) {
+ private boolean testEventFlag(short mask) {
return EventFlags.isSet(this.eventFlags, mask);
}
- private final void setEventFlag(short mask, boolean on) {
+ private void setEventFlag(short mask, boolean on) {
this.eventFlags = EventFlags.set(this.eventFlags, mask, on);
}
@@ -603,19 +603,19 @@ public class EntryEventImpl
return this.op.isEviction();
}
- public final void setEvicted() {
+ public void setEvicted() {
this.isEvicted = true;
}
- public final boolean isEvicted() {
+ public boolean isEvicted() {
return this.isEvicted;
}
- public final boolean isPendingSecondaryExpireDestroy() {
+ public boolean isPendingSecondaryExpireDestroy() {
return this.isPendingSecondaryExpireDestroy;
}
- public final void setPendingSecondaryExpireDestroy(boolean value) {
+ public void setPendingSecondaryExpireDestroy(boolean value) {
this.isPendingSecondaryExpireDestroy = value;
}
@@ -670,7 +670,7 @@ public class EntryEventImpl
*
* @return null if no event id has been set
*/
- public final EventID getEventId() {
+ public EventID getEventId() {
return this.eventID;
}
@@ -720,7 +720,7 @@ public class EntryEventImpl
*
* @return the value in the cache prior to this event.
*/
- public final Object getOldValue() {
+ public Object getOldValue() {
try {
if (isOriginRemote() && this.region.isProxy()) {
return null;
@@ -763,7 +763,7 @@ public class EntryEventImpl
* Like getRawNewValue except that if the result is an off-heap reference then copy it to the
* heap. Note: to prevent the heap copy use getRawNewValue instead
*/
- public final Object getRawNewValueAsHeapObject() {
+ public Object getRawNewValueAsHeapObject() {
Object result = basicGetNewValue();
if (mayHaveOffHeapReferences()) {
result = OffHeapHelper.copyIfNeeded(result);
@@ -777,7 +777,7 @@ public class EntryEventImpl
* lifetime of the EntryEventImpl instance that returned the value. Else return the raw form.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
- public final Object getRawNewValue() {
+ public Object getRawNewValue() {
return basicGetNewValue();
}
@@ -809,7 +809,7 @@ public class EntryEventImpl
}
@Unretained
- protected final Object basicGetNewValue() {
+ protected Object basicGetNewValue() {
Object result = this.newValue;
if (!this.offHeapOk && isOffHeapReference(result)) {
// this.region.getCache().getLogger().info("DEBUG new value already freed " +
@@ -914,7 +914,7 @@ public class EntryEventImpl
* Like getRawOldValue except that if the result is an off-heap reference then copy it to the
* heap. To avoid the heap copy use getRawOldValue instead.
*/
- public final Object getRawOldValueAsHeapObject() {
+ public Object getRawOldValueAsHeapObject() {
Object result = basicGetOldValue();
if (mayHaveOffHeapReferences()) {
result = OffHeapHelper.copyIfNeeded(result);
@@ -928,7 +928,7 @@ public class EntryEventImpl
* lifetime of the EntryEventImpl instance that returned the value. Else return the raw form.
*/
@Unretained
- public final Object getRawOldValue() {
+ public Object getRawOldValue() {
return basicGetOldValue();
}
@@ -936,7 +936,7 @@ public class EntryEventImpl
* Just like getRawOldValue except if the raw old value is off-heap deserialize it.
*/
@Unretained(ENTRY_EVENT_OLD_VALUE)
- public final Object getOldValueAsOffHeapDeserializedOrRaw() {
+ public Object getOldValueAsOffHeapDeserializedOrRaw() {
Object result = basicGetOldValue();
if (mayHaveOffHeapReferences() && result instanceof StoredObject) {
result = ((CachedDeserializable) result).getDeserializedForReading();
@@ -957,7 +957,7 @@ public class EntryEventImpl
*
* @return the value in the cache after this event.
*/
- public final Object getNewValue() {
+ public Object getNewValue() {
boolean doCopyOnRead = getRegion().isCopyOnRead();
Object nv = basicGetNewValue();
@@ -1010,16 +1010,16 @@ public class EntryEventImpl
private final Object offHeapLock = new Object();
- public final String getNewValueStringForm() {
+ public String getNewValueStringForm() {
return StringUtils.forceToString(basicGetNewValue());
}
- public final String getOldValueStringForm() {
+ public String getOldValueStringForm() {
return StringUtils.forceToString(basicGetOldValue());
}
/** Set a deserialized value */
- public final void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) {
+ public void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) {
basicSetNewValue(obj);
}
@@ -1047,7 +1047,7 @@ public class EntryEventImpl
/**
* @see org.apache.geode.cache.CacheEvent#getRegion()
*/
- public final LocalRegion getRegion() {
+ public LocalRegion getRegion() {
return region;
}
@@ -1179,7 +1179,7 @@ public class EntryEventImpl
/**
* Export the event's new value to the given importer.
*/
- public final void exportNewValue(NewValueImporter importer) {
+ public void exportNewValue(NewValueImporter importer) {
final boolean prefersSerialized = importer.prefersNewSerialized();
if (prefersSerialized) {
if (getCachedSerializedNewValue() != null) {
@@ -1271,7 +1271,7 @@ public class EntryEventImpl
/**
* Export the event's old value to the given importer.
*/
- public final void exportOldValue(OldValueImporter importer) {
+ public void exportOldValue(OldValueImporter importer) {
final boolean prefersSerialized = importer.prefersOldSerialized();
if (prefersSerialized) {
if (this.oldValueBytes != null && this.oldValue instanceof CachedDeserializable) {
@@ -1310,7 +1310,7 @@ public class EntryEventImpl
* Just like getRawNewValue(true) except if the raw new value is off-heap deserialize it.
*/
@Unretained(ENTRY_EVENT_NEW_VALUE)
- public final Object getNewValueAsOffHeapDeserializedOrRaw() {
+ public Object getNewValueAsOffHeapDeserializedOrRaw() {
Object result = getRawNewValue();
if (mayHaveOffHeapReferences() && result instanceof StoredObject) {
result = ((CachedDeserializable) result).getDeserializedForReading();
@@ -1352,7 +1352,7 @@ public class EntryEventImpl
return result;
}
- public final Object getDeserializedValue() {
+ public Object getDeserializedValue() {
final Object val = basicGetNewValue();
if (val instanceof CachedDeserializable) {
return ((CachedDeserializable) val).getDeserializedForReading();
@@ -1361,7 +1361,7 @@ public class EntryEventImpl
}
}
- public final byte[] getSerializedValue() {
+ public byte[] getSerializedValue() {
if (this.newValueBytes == null) {
final Object val;
val = basicGetNewValue();
@@ -1392,7 +1392,7 @@ public class EntryEventImpl
/**
* @param isSynced true if RegionEntry currently under synchronization
*/
- private final void makeSerializedNewValue(boolean isSynced) {
+ private void makeSerializedNewValue(boolean isSynced) {
Object obj = basicGetNewValue();
// ezoerner:20080611 In the case where there is an unapplied
@@ -1448,7 +1448,7 @@ public class EntryEventImpl
return this.cachedSerializedNewValue;
}
- public final void setSerializedNewValue(byte[] serializedValue) {
+ public void setSerializedNewValue(byte[] serializedValue) {
Object newVal = null;
if (serializedValue != null) {
newVal = CachedDeserializableFactory.create(serializedValue);
@@ -1880,11 +1880,11 @@ public class EntryEventImpl
return tmp != null && tmp != Token.NOT_AVAILABLE;
}
- public final boolean hasOldValue() {
+ public boolean hasOldValue() {
return this.oldValue != null && this.oldValue != Token.NOT_AVAILABLE;
}
- public final boolean isOldValueAToken() {
+ public boolean isOldValueAToken() {
return this.oldValue instanceof Token;
}
@@ -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));
}
}
@@ -2187,7 +2187,7 @@ public class EntryEventImpl
* @return null if old value is not serialized; otherwise returns a SerializedCacheValueImpl
* containing the old value.
*/
- public final SerializedCacheValue<?> getSerializedOldValue() {
+ public SerializedCacheValue<?> getSerializedOldValue() {
@Unretained(ENTRY_EVENT_OLD_VALUE)
final Object tmp = basicGetOldValue();
if (tmp instanceof CachedDeserializable) {
@@ -2525,7 +2525,7 @@ public class EntryEventImpl
return result;
}
- public static final class SerializedCacheValueImpl
+ public static class SerializedCacheValueImpl
implements SerializedCacheValue, CachedDeserializable, Sendable {
private final EntryEventImpl event;
@Unretained
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 254fc88..45df435 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -181,7 +181,7 @@ public class EntryExpiryTask extends ExpiryTask {
}
@Override
- final protected void reschedule() throws CacheException {
+ protected void reschedule() throws CacheException {
if (isCacheClosing() || getLocalRegion().isClosed() || getLocalRegion().isDestroyed()
|| !isExpirationAllowed()) {
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
index 33e4895..f569ff7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.cache.lru.MemLRUCapacityController;
*
* @since GemFire 5.0
*/
-public final class EvictionAttributesImpl extends EvictionAttributes
+public class EvictionAttributesImpl extends EvictionAttributes
implements EvictionAttributesMutator {
private static final long serialVersionUID = -6404395520499379715L;
@@ -222,11 +222,11 @@ public final class EvictionAttributesImpl extends EvictionAttributes
return this.algorithm.isLIFO();
}
- public final boolean isLIFOEntry() {
+ public boolean isLIFOEntry() {
return this.algorithm == EvictionAlgorithm.LIFO_ENTRY;
}
- public final boolean isLIFOMemory() {
+ public boolean isLIFOMemory() {
return this.algorithm == EvictionAlgorithm.LIFO_MEMORY;
}
[32/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
index df880a0..f4e547f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
@@ -4280,7 +4280,7 @@ public class DistributionManager implements DM {
* A simple class used for locking the list of members of the distributed system. We give this
* lock its own class so that it shows up nicely in stack traces.
*/
- private static final class MembersLock {
+ private static class MembersLock {
protected MembersLock() {
}
@@ -4290,7 +4290,7 @@ public class DistributionManager implements DM {
* A simple class used for locking the list of membership listeners. We give this lock its own
* class so that it shows up nicely in stack traces.
*/
- private static final class MembershipListenersLock {
+ private static class MembershipListenersLock {
protected MembershipListenersLock() {}
}
@@ -4298,7 +4298,7 @@ public class DistributionManager implements DM {
* This is the listener implementation for responding from events from the Membership Manager.
*
*/
- private final class MyListener implements DistributedMembershipListener {
+ private class MyListener implements DistributedMembershipListener {
DistributionManager dm;
public MyListener(DistributionManager dm) {
@@ -4438,7 +4438,7 @@ public class DistributionManager implements DM {
*
*
*/
- private static final class MemberJoinedEvent extends MemberEvent {
+ private static class MemberJoinedEvent extends MemberEvent {
MemberJoinedEvent(InternalDistributedMember id) {
super(id);
}
@@ -4458,7 +4458,7 @@ public class DistributionManager implements DM {
* This is an event reflecting that a InternalDistributedMember has left the system.
*
*/
- private static final class MemberDepartedEvent extends MemberEvent {
+ private static class MemberDepartedEvent extends MemberEvent {
String reason;
MemberDepartedEvent(InternalDistributedMember id, String r) {
@@ -4483,7 +4483,7 @@ public class DistributionManager implements DM {
*
*
*/
- private static final class MemberCrashedEvent extends MemberEvent {
+ private static class MemberCrashedEvent extends MemberEvent {
String reason;
MemberCrashedEvent(InternalDistributedMember id, String r) {
@@ -4506,7 +4506,7 @@ public class DistributionManager implements DM {
* This is an event reflecting that a InternalDistributedMember may be missing but has not yet
* left the system.
*/
- private static final class MemberSuspectEvent extends MemberEvent {
+ private static class MemberSuspectEvent extends MemberEvent {
InternalDistributedMember whoSuspected;
String reason;
@@ -4536,7 +4536,7 @@ public class DistributionManager implements DM {
}
}
- private static final class ViewInstalledEvent extends MemberEvent {
+ private static class ViewInstalledEvent extends MemberEvent {
NetView view;
ViewInstalledEvent(NetView view) {
@@ -4564,7 +4564,7 @@ public class DistributionManager implements DM {
}
}
- private static final class QuorumLostEvent extends MemberEvent {
+ private static class QuorumLostEvent extends MemberEvent {
Set<InternalDistributedMember> failures;
List<InternalDistributedMember> remaining;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index 69a5d90..403b420 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -144,7 +144,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
return mask;
}
- public static final byte getNumBits(final int maxValue) {
+ public static byte getNumBits(final int maxValue) {
byte numBits = 1;
while ((1 << numBits) <= maxValue) {
numBits++;
@@ -345,7 +345,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Scheduled action to take when on this message when we are ready to process it.
*/
- protected final void scheduleAction(final DistributionManager dm) {
+ protected void scheduleAction(final DistributionManager dm) {
if (logger.isTraceEnabled(LogMarker.DM)) {
logger.trace(LogMarker.DM, "Processing '{}'", this);
}
@@ -411,7 +411,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
/**
* Schedule this message's process() method in a thread determined by getExecutor()
*/
- protected final void schedule(final DistributionManager dm) {
+ protected void schedule(final DistributionManager dm) {
boolean inlineProcess = DistributionManager.INLINE_PROCESS
&& getProcessorType() == DistributionManager.SERIAL_EXECUTOR && !isPreciousThread();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 35c0a2e..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,14 +30,13 @@ public abstract class DistributionMessageObserver {
* @param instance
* @return the old observer, or null if there was no old observer.
*/
- public static final DistributionMessageObserver setInstance(
- DistributionMessageObserver instance) {
+ public static DistributionMessageObserver setInstance(DistributionMessageObserver instance) {
DistributionMessageObserver oldInstance = DistributionMessageObserver.instance;
DistributionMessageObserver.instance = instance;
return oldInstance;
}
- public static final DistributionMessageObserver getInstance() {
+ public static DistributionMessageObserver getInstance() {
return instance;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index a519c0e..3f3eaba 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -212,14 +212,14 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor {
}
@Override
- protected final void beforeExecute(Thread t, Runnable r) {
+ protected void beforeExecute(Thread t, Runnable r) {
if (this.stats != null) {
this.stats.startJob();
}
}
@Override
- protected final void afterExecute(Runnable r, Throwable ex) {
+ protected void afterExecute(Runnable r, Throwable ex) {
if (this.stats != null) {
this.stats.endJob();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
index 939b8ed..93ebe55 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HighPriorityAckedMessage.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
* @since GemFire 5.1
*/
-public final class HighPriorityAckedMessage extends HighPriorityDistributionMessage
+public class HighPriorityAckedMessage extends HighPriorityDistributionMessage
implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 873ec4b..eeb44e7a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -1460,7 +1460,7 @@ public class InternalDistributedSystem extends DistributedSystem
/**
* Returns the distribution manager without checking for connected or not so can also return null.
*/
- public final DM getDM() {
+ public DM getDM() {
return this.dm;
}
@@ -1471,7 +1471,7 @@ public class InternalDistributedSystem extends DistributedSystem
*
* @return the quorum checking service
*/
- public final QuorumChecker getQuorumChecker() {
+ public QuorumChecker getQuorumChecker() {
return this.quorumChecker;
}
@@ -1743,7 +1743,7 @@ public class InternalDistributedSystem extends DistributedSystem
}
@Override
- public final int getStatisticsCount() {
+ public int getStatisticsCount() {
int result = 0;
List<Statistics> statsList = this.statsList;
if (statsList != null) {
@@ -1753,7 +1753,7 @@ public class InternalDistributedSystem extends DistributedSystem
}
@Override
- public final Statistics findStatistics(long id) {
+ public Statistics findStatistics(long id) {
List<Statistics> statsList = this.statsList;
for (Statistics s : statsList) {
if (s.getUniqueId() == id) {
@@ -1765,7 +1765,7 @@ public class InternalDistributedSystem extends DistributedSystem
}
@Override
- public final boolean statisticsExists(long id) {
+ public boolean statisticsExists(long id) {
List<Statistics> statsList = this.statsList;
for (Statistics s : statsList) {
if (s.getUniqueId() == id) {
@@ -1776,7 +1776,7 @@ public class InternalDistributedSystem extends DistributedSystem
}
@Override
- public final Statistics[] getStatistics() {
+ public Statistics[] getStatistics() {
List<Statistics> statsList = this.statsList;
return (Statistics[]) statsList.toArray(new Statistics[0]);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
index a190d05..6b19a12 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java
@@ -541,7 +541,7 @@ public class LocatorLoadSnapshot {
}
}
- private final class LoadEstimateTask implements Runnable {
+ private class LoadEstimateTask implements Runnable {
private final EstimateMapKey key;
private final LoadHolder lh;
@@ -578,7 +578,7 @@ public class LocatorLoadSnapshot {
}
}
- private static final class LoadHolder {
+ private static class LoadHolder {
private float load;
private float loadPerConnection;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
index b7f6e04..1f51a8d 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java
@@ -112,7 +112,7 @@ public class LocatorStats {
}
- public final void setServerCount(int sc) {
+ public void setServerCount(int sc) {
if (this._stats == null) {
this.endpoints_known.set(sc);
} else {
@@ -120,7 +120,7 @@ public class LocatorStats {
}
}
- public final void setLocatorCount(int lc) {
+ public void setLocatorCount(int lc) {
if (this._stats == null) {
this.known_locators.set(lc);
} else {
@@ -128,7 +128,7 @@ public class LocatorStats {
}
}
- public final void endLocatorRequest(long startTime) {
+ public void endLocatorRequest(long startTime) {
long took = DistributionStats.getStatTime() - startTime;
if (this._stats == null) {
this.requests_to_locator.incrementAndGet();
@@ -143,7 +143,7 @@ public class LocatorStats {
}
}
- public final void endLocatorResponse(long startTime) {
+ public void endLocatorResponse(long startTime) {
long took = DistributionStats.getStatTime() - startTime;
if (this._stats == null) {
this.responses_from_locator.incrementAndGet();
@@ -160,7 +160,7 @@ public class LocatorStats {
- public final void setLocatorRequests(long rl) {
+ public void setLocatorRequests(long rl) {
if (this._stats == null) {
this.requests_to_locator.set(rl);
} else {
@@ -168,7 +168,7 @@ public class LocatorStats {
}
}
- public final void setLocatorResponses(long rl) {
+ public void setLocatorResponses(long rl) {
if (this._stats == null) {
this.responses_from_locator.set(rl);
} else {
@@ -176,7 +176,7 @@ public class LocatorStats {
}
}
- public final void setServerLoadUpdates(long v) {
+ public void setServerLoadUpdates(long v) {
if (this._stats == null) {
this.serverLoadUpdates.set(v);
} else {
@@ -184,7 +184,7 @@ public class LocatorStats {
}
}
- public final void incServerLoadUpdates() {
+ public void incServerLoadUpdates() {
if (this._stats == null) {
this.serverLoadUpdates.incrementAndGet();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
index 4a76f20..9888342 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java
@@ -23,7 +23,7 @@ package org.apache.geode.distributed.internal;
public abstract class PooledDistributionMessage extends DistributionMessage {
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.STANDARD_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
index f2092a4..00dcf00 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
@@ -151,14 +151,14 @@ public class PooledExecutorWithDMStats extends ThreadPoolExecutor {
}
@Override
- protected final void beforeExecute(Thread t, Runnable r) {
+ protected void beforeExecute(Thread t, Runnable r) {
if (this.stats != null) {
this.stats.startJob();
}
}
@Override
- protected final void afterExecute(Runnable r, Throwable ex) {
+ protected void afterExecute(Runnable r, Throwable ex) {
if (this.stats != null) {
this.stats.endJob();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
index 4022759..924d49b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java
@@ -38,7 +38,7 @@ import org.apache.geode.internal.logging.PureLogWriter;
*
* @since GemFire 2013
*/
-public final class ProductUseLog implements MembershipListener {
+public class ProductUseLog implements MembershipListener {
protected static long MAX_PRODUCT_USE_FILE_SIZE = Long.getLong("max_view_log_size", 5000000);
private final int logLevel;
private final File productUseLogFile;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
index 3904ba7..c57d38e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java
@@ -90,7 +90,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
* @throws InterruptedException
* @throws ReliableReplyException when a member departs
*/
- public final void waitForReliableDelivery()
+ public void waitForReliableDelivery()
throws ReplyException, InterruptedException, ReliableReplyException {
waitForReliableDelivery(0);
}
@@ -102,7 +102,7 @@ public class ReliableReplyProcessor21 extends ReplyProcessor21 {
* @throws InterruptedException
* @throws ReliableReplyException
*/
- public final void waitForReliableDelivery(long msecs)
+ public void waitForReliableDelivery(long msecs)
throws ReplyException, InterruptedException, ReliableReplyException {
super.waitForReplies(msecs);
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
index 73fde88..2673f68 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java
@@ -182,11 +182,11 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
* @param dm the distribution manager that is processing the message.
*/
@Override
- protected final void process(final DistributionManager dm) {
+ protected void process(final DistributionManager dm) {
dmProcess(dm);
}
- public final void dmProcess(final DM dm) {
+ public void dmProcess(final DM dm) {
final long startTime = getTimestamp();
ReplyProcessor21 processor = ReplyProcessor21.getProcessor(processorId);
try {
@@ -262,7 +262,7 @@ public class ReplyMessage extends HighPriorityDistributionMessage {
public static final byte OBJECT_FLAG = 0x40;
public static final byte INTERNAL_FLAG = (byte) 0x80;
- private static final boolean testFlag(byte status, byte flag) {
+ private static boolean testFlag(byte status, byte flag) {
return (status & flag) != 0;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index bc66dd8..7e87c8c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -512,7 +512,7 @@ public class ReplyProcessor21 implements MembershipListener {
* @throws InterruptedException thrown if the wait is interrupted
* @see #canStopWaiting()
*/
- public final void waitForReplies() throws InterruptedException, ReplyException {
+ public void waitForReplies() throws InterruptedException, ReplyException {
boolean result = waitForReplies(0);
Assert.assertTrue(result, "failed but no exception thrown");
@@ -587,7 +587,7 @@ public class ReplyProcessor21 implements MembershipListener {
// start waiting for replies without explicitly waiting for all of them using
// waitForReplies* methods; useful for streaming of results in function execution
- public final void startWait() {
+ public void startWait() {
if (!this.waiting && stillWaiting()) {
preWait();
}
@@ -595,7 +595,7 @@ public class ReplyProcessor21 implements MembershipListener {
// end waiting for replies without explicitly invoking waitForReplies*
// methods; useful for streaming of results in function execution
- public final void endWait(boolean doCleanup) {
+ public void endWait(boolean doCleanup) {
try {
postWait();
} finally {
@@ -618,11 +618,11 @@ public class ReplyProcessor21 implements MembershipListener {
*
* @return Whether or not we received all of the replies in the given amount of time.
*/
- public final boolean waitForReplies(long msecs) throws InterruptedException, ReplyException {
+ public boolean waitForReplies(long msecs) throws InterruptedException, ReplyException {
return waitForReplies(msecs, getLatch(), true);
}
- public final boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp)
+ public boolean waitForReplies(long msecs, StoppableCountDownLatch latch, boolean doCleanUp)
throws InterruptedException, ReplyException {
if (this.keeperCleanedUp) {
throw new IllegalStateException(
@@ -765,11 +765,11 @@ public class ReplyProcessor21 implements MembershipListener {
* "ack-threshold-exception" is set to true
* @throws IllegalStateException if the processor is not registered to receive replies
*/
- public final boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException {
+ public boolean waitForRepliesUninterruptibly(long p_msecs) throws ReplyException {
return waitForRepliesUninterruptibly(p_msecs, getLatch(), true);
}
- public final boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch,
+ public boolean waitForRepliesUninterruptibly(long p_msecs, StoppableCountDownLatch latch,
boolean doCleanUp) throws ReplyException {
if (this.keeperCleanedUp) {
throw new IllegalStateException(
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
index abe8133..567bbac 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -37,7 +37,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
*
* @since GemFire 3.0
*/
-public final class RuntimeDistributionConfigImpl extends DistributionConfigImpl {
+public class RuntimeDistributionConfigImpl extends DistributionConfigImpl {
private static final long serialVersionUID = -805637520096606113L;
transient private final InternalDistributedSystem ds;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
index 3217e19..c56a929 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java
@@ -34,8 +34,7 @@ import org.apache.geode.internal.logging.LogService;
* some tests to flush the serial communication channels after no-ack tests.
*
*/
-public final class SerialAckedMessage extends SerialDistributionMessage
- implements MessageWithReply {
+public class SerialAckedMessage extends SerialDistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
/** The is of the distribution manager that sent the message */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
index 45cffa3..5861e40 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java
@@ -33,14 +33,14 @@ public class SerialQueuedExecutorWithDMStats extends ThreadPoolExecutor {
}
@Override
- protected final void beforeExecute(Thread t, Runnable r) {
+ protected void beforeExecute(Thread t, Runnable r) {
if (this.stats != null) {
this.stats.startJob();
}
}
@Override
- protected final void afterExecute(Runnable r, Throwable ex) {
+ protected void afterExecute(Runnable r, Throwable ex) {
if (this.stats != null) {
this.stats.endJob();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
index 6dcf0a5..3004496 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java
@@ -66,11 +66,11 @@ public class ServerLocation implements DataSerializable, Comparable {
this.port = port;
}
- public final String getHostName() {
+ public String getHostName() {
return hostName;
}
- public final int getPort() {
+ public int getPort() {
return port;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
index 46c51db..42de647 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* N.B. -- this is a SerialDistributionMessage due to bug32980
*/
-public final class ShutdownMessage extends HighPriorityDistributionMessage
+public class ShutdownMessage extends HighPriorityDistributionMessage
implements AdminMessageType, MessageWithReply {
/** The is of the distribution manager that is shutting down */
protected InternalDistributedMember id;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
index 022cea7..d81aed0 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
@@ -38,8 +38,7 @@ import java.util.Set;
/**
* A message that is sent to all other distribution manager when a distribution manager starts up.
*/
-public final class StartupMessage extends HighPriorityDistributionMessage
- implements AdminMessageType {
+public class StartupMessage extends HighPriorityDistributionMessage implements AdminMessageType {
private static final Logger logger = LogService.getLogger();
private String version = GemFireVersion.getGemFireVersion(); // added for bug 29005
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 ec2e3e6..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 final 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/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
index f8fcdd0..df21141 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
@@ -123,7 +123,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockQueryMessage
// -------------------------------------------------------------------------
- public static final class DLockQueryMessage extends PooledDistributionMessage
+ public static class DLockQueryMessage extends PooledDistributionMessage
implements MessageWithReply {
/** The name of the DistributedLockService */
protected String serviceName;
@@ -348,7 +348,7 @@ public class DLockQueryProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockQueryReplyMessage
// -------------------------------------------------------------------------
- public static final class DLockQueryReplyMessage extends ReplyMessage {
+ public static class DLockQueryReplyMessage extends ReplyMessage {
static final int NOT_GRANTOR = 0;
static final int OK = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index 2a48308..0ed4890 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -187,7 +187,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockRecoverGrantorMessage
// -------------------------------------------------------------------------
- public static final class DLockRecoverGrantorMessage extends PooledDistributionMessage
+ public static class DLockRecoverGrantorMessage extends PooledDistributionMessage
implements MessageWithReply {
/** The name of the DistributedLockService */
@@ -312,7 +312,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockRecoverGrantorReplyMessage
// -------------------------------------------------------------------------
- public static final class DLockRecoverGrantorReplyMessage extends ReplyMessage {
+ public static class DLockRecoverGrantorReplyMessage extends ReplyMessage {
public static final int OK = 0;
public static final int GRANTOR_DISPUTE = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
index 6adfa9b..e133f79 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
@@ -132,7 +132,7 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockReleaseMessage
// -------------------------------------------------------------------------
- public static final class DLockReleaseMessage extends HighPriorityDistributionMessage
+ public static class DLockReleaseMessage extends HighPriorityDistributionMessage
implements MessageWithReply {
/** The name of the DistributedLockService */
protected String serviceName;
@@ -372,7 +372,7 @@ public class DLockReleaseProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// DLockReleaseReplyMessage
// -------------------------------------------------------------------------
- public static final class DLockReleaseReplyMessage extends ReplyMessage {
+ public static class DLockReleaseReplyMessage extends ReplyMessage {
static final int NOT_GRANTOR = 0;
static final int OK = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index ca012d3..c38cdad 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -255,15 +255,15 @@ public class DLockService extends DistributedLockService {
}
}
- private final boolean isCurrentThreadDoingDestroy() {
+ private boolean isCurrentThreadDoingDestroy() {
return Boolean.TRUE.equals(this.destroyingThread.get());
}
- private final void setDestroyingThread() {
+ private void setDestroyingThread() {
this.destroyingThread.set(Boolean.TRUE);
}
- private final void clearDestroyingThread() {
+ private void clearDestroyingThread() {
this.destroyingThread.remove();
}
@@ -2102,7 +2102,7 @@ public class DLockService extends DistributedLockService {
// Public instance methods
// -------------------------------------------------------------------------
- public final DistributedLockStats getStats() {
+ public DistributedLockStats getStats() {
return this.dlockStats;
}
@@ -2299,11 +2299,11 @@ public class DLockService extends DistributedLockService {
}
/** The name of this service */
- public final String getName() {
+ public String getName() {
return this.serviceName;
}
- public final DM getDistributionManager() {
+ public DM getDistributionManager() {
return this.dm;
}
@@ -3180,7 +3180,7 @@ public class DLockService extends DistributedLockService {
// -------------------------------------------------------------------------
/** Used as the name (key) for the suspend locking entry in the tokens map */
- public static final class SuspendLockingToken implements DataSerializableFixedID {
+ public static class SuspendLockingToken implements DataSerializableFixedID {
public SuspendLockingToken() {}
@Override
@@ -3270,7 +3270,7 @@ public class DLockService extends DistributedLockService {
}
- public final CancelCriterion getCancelCriterion() {
+ public CancelCriterion getCancelCriterion() {
return stopper;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
index f05cc82..907e731 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
@@ -99,7 +99,7 @@ public class DeposeGrantorProcessor extends ReplyProcessor21 {
/////////////// Inner message classes //////////////////
- public static final class DeposeGrantorMessage extends PooledDistributionMessage
+ public static class DeposeGrantorMessage extends PooledDistributionMessage
implements MessageWithReply {
private int processorId;
private String serviceName;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
index c779e6f..9b379c7 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock;
*
* @since GemFire 5.1
*/
-public final class DistributedMemberLock implements Lock {
+public class DistributedMemberLock implements Lock {
/** Lock lease timeout value that never expires. */
public static final long NON_EXPIRING_LEASE = -1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
index 886aafc..0dbaa0f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
@@ -143,7 +143,7 @@ public class ElderInitProcessor extends ReplyProcessor21 {
/////////////// Inner message classes //////////////////
- public static final class ElderInitMessage extends PooledDistributionMessage
+ public static class ElderInitMessage extends PooledDistributionMessage
implements MessageWithReply {
private int processorId;
@@ -222,7 +222,7 @@ public class ElderInitProcessor extends ReplyProcessor21 {
}
}
- public static final class ElderInitReplyMessage extends ReplyMessage {
+ public static class ElderInitReplyMessage extends ReplyMessage {
private ArrayList grantors; // svc names
private ArrayList grantorVersions; // grantor version longs
private ArrayList grantorSerialNumbers; // grantor dls serial number ints
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
index ba78771..1ee15af 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
@@ -355,7 +355,7 @@ public class ElderState {
}
}
- private final boolean isInitiatingTransfer(GrantorInfo gi) {
+ private boolean isInitiatingTransfer(GrantorInfo gi) {
if (gi == null)
return false;
synchronized (this) {
@@ -363,20 +363,20 @@ public class ElderState {
}
}
- private final void beginInitiatingTransfer(GrantorInfo gi) {
+ private void beginInitiatingTransfer(GrantorInfo gi) {
synchronized (this) {
gi.setInitiatingTransfer(true);
}
}
- private final void finishInitiatingTransfer(GrantorInfo gi) {
+ private void finishInitiatingTransfer(GrantorInfo gi) {
synchronized (this) {
gi.setInitiatingTransfer(false);
notifyAll();
}
}
- private final void waitWhileInitiatingTransfer(GrantorInfo gi) {
+ private void waitWhileInitiatingTransfer(GrantorInfo gi) {
synchronized (this) {
boolean interrupted = false;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
index 449627d..6fd969f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
@@ -38,40 +38,40 @@ public class GrantorInfo {
}
/** Caller is sync'ed on ElderState */
- public final void setInitiatingTransfer(boolean initiatingTransfer) {
+ public void setInitiatingTransfer(boolean initiatingTransfer) {
this.initiatingTransfer = initiatingTransfer;
}
/** Caller is sync'ed on ElderState */
- public final boolean isInitiatingTransfer() {
+ public boolean isInitiatingTransfer() {
return this.initiatingTransfer;
}
/**
* Gets the member id of this grantor.
*/
- public final InternalDistributedMember getId() {
+ public InternalDistributedMember getId() {
return this.id;
}
/**
* Returns true if the current grantor needs to do lock recovery.
*/
- public final boolean needsRecovery() {
+ public boolean needsRecovery() {
return this.needsRecovery;
}
/**
* Returns the elder version id of this grantor.
*/
- public final long getVersionId() {
+ public long getVersionId() {
return this.versionId;
}
/**
* Returns the DLockService serial number of this grantor.
*/
- public final int getSerialNumber() {
+ public int getSerialNumber() {
return this.serialNumber;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
index 0b301c3..21dd318 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
@@ -114,7 +114,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
}
- private final static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es,
+ private static boolean basicStartElderCall(InternalDistributedSystem sys, ElderState es,
InternalDistributedMember elder, DLockService dls) {
GrantorRequestContext grc = sys.getGrantorRequestContext();
grc.elderLock.lock();
@@ -217,7 +217,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
* Sets currentElder to the memberId of the current elder if elder is remote; null if elder is in
* our vm. TODO: collaboration lock was removed
*/
- private final static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls,
+ private static ElderState startElderCall(InternalDistributedSystem sys, DLockService dls,
boolean usesElderCollaborationLock) {
InternalDistributedMember elder;
ElderState es = null;
@@ -248,7 +248,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
return es;
}
- private final static void finishElderCall(GrantorRequestContext grc, ElderState es) {
+ private static void finishElderCall(GrantorRequestContext grc, ElderState es) {
if (es == null) {
grc.elderLock.lock();
try {
@@ -458,7 +458,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
/////////////// Inner message classes //////////////////
- public static final class GrantorRequestMessage extends PooledDistributionMessage
+ public static class GrantorRequestMessage extends PooledDistributionMessage
implements MessageWithReply {
private long grantorVersion;
private int dlsSerialNumber;
@@ -637,7 +637,7 @@ public class GrantorRequestProcessor extends ReplyProcessor21 {
}
}
- public static final class GrantorInfoReplyMessage extends ReplyMessage {
+ public static class GrantorInfoReplyMessage extends ReplyMessage {
private InternalDistributedMember grantor;
private long elderVersionId;
private int grantorSerialNumber;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
index 9a6c55b..d8f688b 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
@@ -103,7 +103,7 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
/////////////// Inner message classes //////////////////
- public static final class NonGrantorDestroyedMessage extends PooledDistributionMessage
+ public static class NonGrantorDestroyedMessage extends PooledDistributionMessage
implements MessageWithReply {
private int processorId;
@@ -218,7 +218,7 @@ public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
}
}
- public static final class NonGrantorDestroyedReplyMessage extends ReplyMessage {
+ public static class NonGrantorDestroyedReplyMessage extends ReplyMessage {
public static final byte OK = 0;
public static final byte NOT_GRANTOR = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 41c85d6..b993b53 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -1166,12 +1166,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* index)); } else { sb.append(hostname); } }
*/
- public final void setVersionObjectForTest(Version v) {
+ public void setVersionObjectForTest(Version v) {
this.versionObj = v;
netMbr.setVersion(v);
}
- public final Version getVersionObject() {
+ public Version getVersionObject() {
return this.versionObj;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
index 94c5f38..d2a6d1e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java
@@ -77,19 +77,19 @@ public class JGAddress extends UUID {
}
- public final InetAddress getInetAddress() {
+ public InetAddress getInetAddress() {
return ip_addr;
}
- public final int getPort() {
+ public int getPort() {
return port;
}
- public final int getVmViewId() {
+ public int getVmViewId() {
return this.vmViewId;
}
- protected final void setVmViewId(int id) {
+ protected void setVmViewId(int id) {
this.vmViewId = id;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
index f92c318..be4047f 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java
@@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.NetView;
*
*/
-public final class LocalViewMessage extends SerialDistributionMessage {
+public class LocalViewMessage extends SerialDistributionMessage {
private GMSMembershipManager manager;
private long viewId;
@@ -47,7 +47,7 @@ public final class LocalViewMessage extends SerialDistributionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.VIEW_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
index b67191d..783f651 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java
@@ -416,7 +416,7 @@ public abstract class StreamingOperation {
}
}
- public static final class StreamingReplyMessage extends ReplyMessage {
+ public static class StreamingReplyMessage extends ReplyMessage {
/** the number of this message */
protected int msgNum;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
index 768475b..2e81af6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java
@@ -51,7 +51,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* (a copy is not made) so it should not be changed externally.
* @param version the product version that serialized the object on given bytes
*/
- public final void initialize(byte[] bytes, Version version) {
+ public void initialize(byte[] bytes, Version version) {
this.bytes = bytes;
this.nBytes = bytes.length;
this.pos = 0;
@@ -62,11 +62,11 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
- private final int skipOver(long n) {
+ private int skipOver(long n) {
final int capacity = (this.nBytes - this.pos);
if (n <= capacity) {
this.pos += (int) n;
@@ -81,7 +81,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int read() throws IOException {
+ public int read() throws IOException {
if (this.pos < this.nBytes) {
return (this.bytes[this.pos++] & 0xff);
} else {
@@ -93,7 +93,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int read(byte[] b, int off, int len) {
+ public int read(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
} else if (off < 0 || len < 0 || b.length < (off + len)) {
@@ -117,7 +117,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final long skip(long n) {
+ public long skip(long n) {
return skipOver(n);
}
@@ -125,21 +125,21 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int available() {
+ public int available() {
return (this.nBytes - this.pos);
}
/**
* Get the current position in the byte[].
*/
- public final int position() {
+ public int position() {
return this.pos;
}
/**
* Set the current position in the byte[].
*/
- public final void setPosition(int pos) {
+ public void setPosition(int pos) {
this.pos = pos;
}
@@ -147,7 +147,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final void readFully(byte[] b) throws IOException {
+ public void readFully(byte[] b) throws IOException {
final int len = b.length;
System.arraycopy(this.bytes, this.pos, b, 0, len);
this.pos += len;
@@ -157,7 +157,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final void readFully(byte[] b, int off, int len) throws IOException {
+ public void readFully(byte[] b, int off, int len) throws IOException {
if (len > 0) {
if ((this.nBytes - this.pos) >= len) {
System.arraycopy(this.bytes, this.pos, b, off, len);
@@ -174,7 +174,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int skipBytes(int n) {
+ public int skipBytes(int n) {
return skipOver(n);
}
@@ -182,7 +182,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final boolean readBoolean() throws IOException {
+ public boolean readBoolean() throws IOException {
if (this.pos < this.nBytes) {
return (this.bytes[this.pos++] != 0);
} else {
@@ -194,7 +194,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final byte readByte() throws IOException {
+ public byte readByte() throws IOException {
if (this.pos < this.nBytes) {
return this.bytes[this.pos++];
} else {
@@ -206,7 +206,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int readUnsignedByte() throws IOException {
+ public int readUnsignedByte() throws IOException {
return read();
}
@@ -214,7 +214,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final short readShort() throws IOException {
+ public short readShort() throws IOException {
if ((this.pos + 1) < this.nBytes) {
int result = (this.bytes[this.pos++] & 0xff);
return (short) ((result << 8) | (this.bytes[this.pos++] & 0xff));
@@ -227,7 +227,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final int readUnsignedShort() throws IOException {
+ public int readUnsignedShort() throws IOException {
if ((this.pos + 1) < this.nBytes) {
int result = (this.bytes[this.pos++] & 0xff);
return ((result << 8) | (this.bytes[this.pos++] & 0xff));
@@ -268,7 +268,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final long readLong() throws IOException {
+ public long readLong() throws IOException {
if ((this.pos + 7) < this.nBytes) {
long result = (this.bytes[this.pos++] & 0xff);
result = (result << 8) | (this.bytes[this.pos++] & 0xff);
@@ -287,7 +287,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final float readFloat() throws IOException {
+ public float readFloat() throws IOException {
return Float.intBitsToFloat(readInt());
}
@@ -295,7 +295,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final double readDouble() throws IOException {
+ public double readDouble() throws IOException {
return Double.longBitsToDouble(readLong());
}
@@ -303,7 +303,7 @@ public class ByteArrayDataInput extends InputStream implements DataInput, Versio
* {@inheritDoc}
*/
@Override
- public final String readUTF() throws IOException {
+ public String readUTF() throws IOException {
final int utfLen = readUnsignedShort();
if ((this.pos + utfLen) <= this.nBytes) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 2363990..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
@@ -37,7 +37,7 @@ public class ByteBufferOutputStream extends OutputStream {
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
try {
this.buffer.put((byte) (b & 0xff));
} catch (BufferOverflowException e) {
@@ -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());
@@ -77,11 +77,11 @@ public class ByteBufferOutputStream extends OutputStream {
}
}
- public final int size() {
+ public int size() {
return buffer.position();
}
- public final void reset() {
+ public void reset() {
buffer.clear();
}
@@ -89,7 +89,7 @@ public class ByteBufferOutputStream extends OutputStream {
* gets the content ByteBuffer, ready for reading. The stream should not be written to past this
* point until it has been reset.
*/
- public final ByteBuffer getContentBuffer() {
+ public ByteBuffer getContentBuffer() {
buffer.flip();
return buffer;
}
@@ -97,7 +97,7 @@ public class ByteBufferOutputStream extends OutputStream {
/**
* Gets a duplicate of the current content buffer.
*/
- public final ByteBuffer getDuplicateBuffer() {
+ public ByteBuffer getDuplicateBuffer() {
return buffer.duplicate();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index be3b18c..4e77f38 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -31,11 +31,11 @@ public abstract class ExternalizableDSFID implements DataSerializableFixedID, Ex
public abstract void fromData(DataInput in) throws IOException, ClassNotFoundException;
- public final void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(ObjectOutput out) throws IOException {
toData(out);
}
- public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
fromData(in);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
index f71a7c1..120d625 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
@@ -32,11 +32,11 @@ import org.apache.geode.management.internal.cli.util.GfshConsoleReader;
public class GfeConsoleReaderFactory {
private static GfeConsoleReader defaultConsoleReader = createConsoleReader();
- public static final GfeConsoleReader getDefaultConsoleReader() {
+ public static GfeConsoleReader getDefaultConsoleReader() {
return defaultConsoleReader;
}
- public static final GfeConsoleReader createConsoleReader() {
+ public static GfeConsoleReader createConsoleReader() {
GfeConsoleReader consoleReader = null;
if (CliUtil.isGfshVM()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 ef8cfb2..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
@@ -182,7 +182,7 @@ public class HeapDataOutputStream extends OutputStream
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
if (this.ignoreWrites)
return;
checkIfWritable();
@@ -190,14 +190,14 @@ public class HeapDataOutputStream extends OutputStream
buffer.put((byte) b);
}
- private final void ensureCapacity(int amount) {
+ private void ensureCapacity(int amount) {
int remainingSpace = this.buffer.capacity() - this.buffer.position();
if (amount > remainingSpace) {
expand(amount);
}
}
- private final void expand(int amount) {
+ private void expand(int amount) {
if (this.disallowExpansion) {
this.buffer.position(this.memoPosition);
this.ignoreWrites = true;
@@ -217,7 +217,7 @@ public class HeapDataOutputStream extends OutputStream
this.buffer = ByteBuffer.allocate(amount);
}
- private final void checkIfWritable() {
+ private void checkIfWritable() {
if (!this.writeMode) {
throw new IllegalStateException(
LocalizedStrings.HeapDataOutputStream_NOT_IN_WRITE_MODE.toLocalizedString());
@@ -311,7 +311,7 @@ public class HeapDataOutputStream extends OutputStream
}
}
- public final int size() {
+ public int size() {
if (this.writeMode) {
return this.size + this.buffer.position();
} else {
@@ -322,7 +322,7 @@ public class HeapDataOutputStream extends OutputStream
/**
* Free up any unused memory
*/
- public final void trim() {
+ public void trim() {
finishWriting();
if (this.buffer.limit() < this.buffer.capacity()) {
// buffer is less than half full so allocate a new one and copy it in
@@ -333,7 +333,7 @@ public class HeapDataOutputStream extends OutputStream
}
}
- private final void consolidateChunks() {
+ private void consolidateChunks() {
if (this.chunks != null) {
final int size = size();
ByteBuffer newBuffer = ByteBuffer.allocate(size);
@@ -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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final void sendTo(ByteBufferWriter out) {
+ public void sendTo(ByteBufferWriter out) {
finishWriting();
if (this.chunks != null) {
for (ByteBuffer bb : this.chunks) {
@@ -677,11 +676,11 @@ 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 final InputStream getInputStream() {
+ public InputStream getInputStream() {
return new HDInputStream();
}
- private final class HDInputStream extends InputStream {
+ private class HDInputStream extends InputStream {
private Iterator<ByteBuffer> chunkIt;
private ByteBuffer bb;
@@ -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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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 final 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/a4458531/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 7dbd701..78b2944 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -3230,7 +3230,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
* A distribution message that alerts other members of the distributed cache of a new
* {@code DataSerializer} being registered.
*/
- public static final class RegistrationMessage extends SerialDistributionMessage {
+ public static class RegistrationMessage extends SerialDistributionMessage {
/**
* The id of the {@code DataSerializer} that was registered since 5.7 an int instead of a byte
*/
@@ -3465,21 +3465,21 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
*/
protected abstract static class WellKnownDS extends DataSerializer {
@Override
- public final int getId() {
+ public int getId() {
// illegal for a customer to use but since our WellKnownDS is never registered
// with this id it gives us one to use
return 0;
}
@Override
- public final Class[] getSupportedClasses() {
+ public Class[] getSupportedClasses() {
// illegal for a customer to return null but we can do it since we never register
// this serializer.
return null;
}
@Override
- public final Object fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public Object fromData(DataInput in) throws IOException, ClassNotFoundException {
throw new IllegalStateException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
// subclasses need to implement toData
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
index 1c1a73e..64dd90b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
@@ -955,7 +955,7 @@ public class InternalInstantiator {
*
* @since GemFire 5.0
*/
- public static final class RegistrationContextMessage extends RegistrationMessage {
+ public static class RegistrationContextMessage extends RegistrationMessage {
private transient ClientProxyMembershipID context;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 d4ec874..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
@@ -27,7 +27,7 @@ import org.apache.geode.DataSerializer;
* @since GemFire 5.0.2
*
*/
-public final class NullDataOutputStream extends OutputStream implements ObjToByteArraySerializer {
+public class NullDataOutputStream extends OutputStream implements ObjToByteArraySerializer {
private int size;
@@ -37,17 +37,17 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
this.size++;
}
/** override OutputStream's write() */
@Override
- public final void write(byte[] source, int offset, int len) {
+ public void write(byte[] source, int offset, int len) {
this.size += len;
}
- public final int size() {
+ public int size() {
return this.size;
}
@@ -68,7 +68,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the boolean to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeBoolean(boolean v) throws IOException {
+ public void writeBoolean(boolean v) throws IOException {
write(v ? 1 : 0);
}
@@ -82,7 +82,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the byte value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeByte(int v) throws IOException {
+ public void writeByte(int v) throws IOException {
write(v);
}
@@ -105,7 +105,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>short</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeShort(int v) throws IOException {
+ public void writeShort(int v) throws IOException {
this.size += 2;
}
@@ -128,7 +128,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>char</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeChar(int v) throws IOException {
+ public void writeChar(int v) throws IOException {
this.size += 2;
}
@@ -152,7 +152,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>int</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeInt(int v) throws IOException {
+ public void writeInt(int v) throws IOException {
this.size += 4;
}
@@ -180,7 +180,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>long</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeLong(long v) throws IOException {
+ public void writeLong(long v) throws IOException {
this.size += 8;
}
@@ -195,7 +195,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>float</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeFloat(float v) throws IOException {
+ public void writeFloat(float v) throws IOException {
this.size += 4;
}
@@ -210,7 +210,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param v the <code>double</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeDouble(double v) throws IOException {
+ public void writeDouble(double v) throws IOException {
this.size += 8;
}
@@ -228,7 +228,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param str the string of bytes to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeBytes(String str) throws IOException {
+ public void writeBytes(String str) throws IOException {
int strlen = str.length();
if (strlen > 0) {
this.size += strlen;
@@ -246,7 +246,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @param s the string value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeChars(String s) throws IOException {
+ public void writeChars(String s) throws IOException {
int len = s.length();
if (len > 0) {
this.size += len * 2;
@@ -304,7 +304,7 @@ public final class NullDataOutputStream extends OutputStream implements ObjToByt
* @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();
[34/69] [abbrv] geode git commit: GEODE-2915 Messages rejected due to
unknown "vmkind"
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-old-versions/build.gradle
----------------------------------------------------------------------
diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
index eb82a5f..d85eb0b 100644
--- a/geode-old-versions/build.gradle
+++ b/geode-old-versions/build.gradle
@@ -38,7 +38,7 @@ def addTestSource(def source, def geodeVersion) {
// Add sourceSets for backwards compatibility, rolling upgrade, and
// pdx testing.
addTestSource('test100', '1.0.0-incubating')
-addTestSource('test110', '1.1.0')
+addTestSource('test111', '1.1.1')
def generatedResources = "$buildDir/generated-resources/main"
[15/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
index f35b5c0..bba03ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
@@ -15,47 +15,78 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDiskRegionEntryHeap {
public VersionedStatsDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -64,10 +95,11 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -87,7 +119,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -98,19 +130,22 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -120,7 +155,9 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -145,7 +182,6 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -185,10 +221,14 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -198,7 +238,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -208,6 +248,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryHeapUUIDKey.class,
"hitCount");
@@ -216,7 +257,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -225,12 +266,12 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -243,14 +284,15 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -262,7 +304,10 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -279,6 +324,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -296,6 +342,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -325,6 +372,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -357,13 +405,16 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -376,5 +427,8 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
index eb4160b..9013a9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
@@ -15,35 +15,47 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,14 +63,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapIntKey
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -67,6 +98,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +130,19 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +158,9 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +184,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,19 +195,22 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -177,7 +220,9 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -202,7 +247,6 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -242,10 +286,14 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -255,7 +303,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -265,6 +313,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapIntKey.class,
"hitCount");
@@ -273,7 +322,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -282,12 +331,12 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -300,14 +349,15 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -319,7 +369,10 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -336,6 +389,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -353,6 +407,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -382,6 +437,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -414,12 +470,17 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -430,5 +491,8 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
index 87211a7..2a86311 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
@@ -15,35 +15,47 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,14 +63,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapLongKey
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -67,6 +98,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +130,19 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +158,9 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +184,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,19 +195,22 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -177,7 +220,9 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -202,7 +247,6 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -242,10 +286,14 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -255,7 +303,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -265,6 +313,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapLongKey.class,
"hitCount");
@@ -273,7 +322,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -282,12 +331,12 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -300,14 +349,15 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -319,7 +369,10 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -336,6 +389,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -353,6 +407,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -382,6 +437,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -414,12 +470,15 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -430,5 +489,8 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
index db76b43..9a8f17a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
@@ -15,35 +15,47 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,14 +63,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapObjectKey
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -67,6 +97,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +129,19 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +157,9 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +183,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,19 +194,22 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -177,7 +219,9 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -202,7 +246,6 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -242,10 +285,14 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -255,7 +302,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -265,6 +312,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -273,7 +321,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -282,12 +330,12 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -300,14 +348,15 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -319,7 +368,10 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -336,6 +388,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -353,6 +406,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -382,6 +436,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -414,13 +469,19 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
index 981689d..ca5bcd7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
@@ -15,35 +15,47 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,10 +63,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapStringKey1
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -73,9 +100,11 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -84,6 +113,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -115,13 +145,19 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -137,7 +173,9 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -161,7 +199,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -172,19 +210,22 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -194,7 +235,9 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -219,7 +262,6 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -259,10 +301,14 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -272,7 +318,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -282,6 +328,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -290,7 +337,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -299,12 +346,12 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -317,14 +364,15 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -336,7 +384,10 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -353,6 +404,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -370,6 +422,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -399,6 +452,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -431,8 +485,11 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -446,7 +503,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -465,6 +522,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -494,5 +552,8 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
index f09293f..7d111ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
@@ -15,35 +15,47 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,10 +63,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapStringKey2
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -85,9 +112,11 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -96,6 +125,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -127,13 +157,19 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -149,7 +185,9 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -173,7 +211,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -184,19 +222,22 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -206,7 +247,9 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -231,7 +274,6 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -271,10 +313,14 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -284,7 +330,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -294,6 +340,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -302,7 +349,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -311,12 +358,12 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -329,14 +376,15 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -348,7 +396,10 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -365,6 +416,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -382,6 +434,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -411,6 +464,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -443,8 +497,11 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -463,7 +520,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -493,6 +550,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -535,5 +593,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
index 4ddd0ad..ae984b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -15,36 +15,49 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
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.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,15 +65,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
extends VersionedStatsDiskRegionEntryOffHeap {
public VersionedStatsDiskRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -69,6 +101,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -100,13 +133,19 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -122,7 +161,9 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -146,7 +187,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -157,19 +198,22 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -179,7 +223,9 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -204,7 +250,6 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -244,10 +289,14 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -257,7 +306,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -267,6 +316,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskRegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskRegionEntryOffHeapUUIDKey.class,
"hitCount");
@@ -275,7 +325,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -284,12 +334,12 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -302,14 +352,15 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -321,7 +372,10 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -338,6 +392,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -355,6 +410,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -384,6 +440,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -416,13 +473,16 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -435,5 +495,8 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java
index db53cd6..a521e7d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java
@@ -15,44 +15,74 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRURegionEntryHeap {
- public VersionedStatsLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VersionedStatsLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,10 +91,11 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
private static final AtomicLongFieldUpdater<VersionedStatsLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -84,7 +115,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -95,117 +126,121 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -215,7 +250,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -225,6 +260,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsLRURegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsLRURegionEntryHeapIntKey.class,
"hitCount");
@@ -233,7 +269,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -242,12 +278,12 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -260,14 +296,15 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -279,7 +316,10 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -296,6 +336,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -313,6 +354,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -342,6 +384,7 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -374,12 +417,17 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -390,5 +438,8 @@ public class VersionedStatsLRURegionEntryHeapIntKey extends VersionedStatsLRUReg
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[53/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
index 7bd7462..d3c1200 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.distributed;
+import static com.googlecode.catchexception.apis.BDDCatchException.caughtException;
+import static com.googlecode.catchexception.apis.BDDCatchException.when;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.BDDAssertions.then;
+
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -32,12 +38,6 @@ import java.io.FileWriter;
import java.net.InetAddress;
import java.util.Properties;
-import static com.googlecode.catchexception.apis.BDDCatchException.caughtException;
-import static com.googlecode.catchexception.apis.BDDCatchException.when;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Integration tests for ServerLauncher class. These tests may require file system and/or network
* I/O.
@@ -157,7 +157,7 @@ public class ServerLauncherIntegrationTest {
gemfireProperties);
// when: starting with null MemberName
- ServerLauncher launcher = new Builder().setCommand(Command.START).setMemberName(null).build();
+ ServerLauncher launcher = new Builder().setCommand(Command.START).build();
// then: name in gemfire.properties file should be used for MemberName
assertThat(launcher).isNotNull();
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index f5d6271..98f73d8 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -14,17 +14,24 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.support.DistributedSystemAdapter;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import edu.umd.cs.mtc.MultithreadedTestCase;
-import edu.umd.cs.mtc.TestFramework;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.concurrent.Synchroniser;
@@ -42,9 +49,8 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.junit.Assert.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import edu.umd.cs.mtc.MultithreadedTestCase;
+import edu.umd.cs.mtc.TestFramework;
/**
* The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality
@@ -77,6 +83,7 @@ public class ServerLauncherTest {
setThreadingPolicy(new Synchroniser());
}
};
+ DistributedSystem.removeSystem(InternalDistributedSystem.getConnectedInstance());
}
@After
@@ -162,8 +169,6 @@ public class ServerLauncherTest {
assertNull(builder.getMemberName());
assertSame(builder, builder.setMemberName("serverOne"));
assertEquals("serverOne", builder.getMemberName());
- assertSame(builder, builder.setMemberName(null));
- assertNull(builder.getMemberName());
}
@Test(expected = IllegalArgumentException.class)
@@ -190,6 +195,18 @@ public class ServerLauncherTest {
}
}
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetMemberNameToNullString() {
+ try {
+ new Builder().setMemberName(null);
+ } catch (IllegalArgumentException expected) {
+ assertEquals(
+ LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE.toLocalizedString("Server"),
+ expected.getMessage());
+ throw expected;
+ }
+ }
+
@Test
public void testSetAndGetPid() {
Builder builder = new Builder();
@@ -277,8 +294,6 @@ public class ServerLauncherTest {
assertNull(builder.getHostNameForClients());
assertSame(builder, builder.setHostNameForClients("Pegasus"));
assertEquals("Pegasus", builder.getHostNameForClients());
- assertSame(builder, builder.setHostNameForClients(null));
- assertNull(builder.getHostNameForClients());
}
@Test
@@ -498,8 +513,8 @@ public class ServerLauncherTest {
@Test
public void testBuildWithMemberNameSetInApiPropertiesOnStart() {
- ServerLauncher launcher = new Builder().setCommand(ServerLauncher.Command.START)
- .setMemberName(null).set(NAME, "serverABC").build();
+ ServerLauncher launcher =
+ new Builder().setCommand(ServerLauncher.Command.START).set(NAME, "serverABC").build();
assertNotNull(launcher);
assertEquals(ServerLauncher.Command.START, launcher.getCommand());
@@ -511,8 +526,7 @@ public class ServerLauncherTest {
public void testBuildWithMemberNameSetInSystemPropertiesOnStart() {
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "serverXYZ");
- ServerLauncher launcher =
- new Builder().setCommand(ServerLauncher.Command.START).setMemberName(null).build();
+ ServerLauncher launcher = new Builder().setCommand(ServerLauncher.Command.START).build();
assertNotNull(launcher);
assertEquals(ServerLauncher.Command.START, launcher.getCommand());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
index 3ec3b06..cc83faa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
@@ -14,15 +14,17 @@
*/
package org.apache.geode.internal.lang;
-import static org.junit.Assert.*;
-
-import java.util.Calendar;
-import java.util.Date;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Calendar;
+import java.util.Date;
/**
* The ClassUtilsJUnitTest class is a test suite with test cases to test the contract and
@@ -61,8 +63,7 @@ public class ClassUtilsJUnitTest {
@Test(expected = IllegalArgumentException.class)
public void testForNameWithEmptyClassName() {
try {
- ClassUtils.forName(StringUtils.EMPTY_STRING,
- new IllegalArgumentException("Empty Class Name!"));
+ ClassUtils.forName(StringUtils.EMPTY, new IllegalArgumentException("Empty Class Name!"));
} catch (IllegalArgumentException expected) {
assertEquals("Empty Class Name!", expected.getMessage());
throw expected;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
index f3e0abe..503356a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
@@ -14,19 +14,20 @@
*/
package org.apache.geode.internal.lang;
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
/**
* The StringUtilsJUnitTest is a test suite containing test cases for testing the contract and
@@ -42,55 +43,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class StringUtilsJUnitTest {
- @Test
- public void testConcat() {
- assertEquals("", StringUtils.concat((Object[]) null));
- assertEquals("", StringUtils.concat(""));
- assertEquals(" ", StringUtils.concat(" "));
- assertEquals(" ", StringUtils.concat(" "));
- assertEquals("123", StringUtils.concat("123"));
- assertEquals("1 2 3", StringUtils.concat("1 2 3"));
- assertEquals(" 1 2 3 ", StringUtils.concat(" 1 2 3 "));
- assertEquals("trueC13.14159test", StringUtils.concat(true, 'C', 1, 3.14159f, "test"));
- assertEquals("test testing tested", StringUtils.concat("test", " testing", " tested"));
- }
- @Test
- public void testConcatWithDelimiter() {
- assertEquals("", StringUtils.concat(null, null));
- assertEquals("", StringUtils.concat(null, " "));
- assertEquals("", StringUtils.concat(new Object[] {""}, " "));
- assertEquals(" ", StringUtils.concat(new Object[] {" "}, " "));
- assertEquals(" ", StringUtils.concat(new Object[] {" ", " ", " "}, " "));
- assertEquals(" | | ", StringUtils.concat(new Object[] {" ", " ", " "}, "|"));
- assertEquals("abc", StringUtils.concat(new Object[] {"a", "b", "c"}, null));
- assertEquals("abc", StringUtils.concat(new Object[] {"a", "b", "c"}, ""));
- assertEquals("a b c", StringUtils.concat(new Object[] {"a", "b", "c"}, " "));
- assertEquals("a b c", StringUtils.concat(new Object[] {"a", "b", "c"}, " "));
- assertEquals("a_b_c", StringUtils.concat(new Object[] {"a", "b", "c"}, "_"));
- assertEquals("a|b|c", StringUtils.concat(new Object[] {"a", "b", "c"}, "|"));
- assertEquals("a>b>c", StringUtils.concat(new Object[] {"a", "b", "c"}, ">"));
- assertEquals("a&b&c", StringUtils.concat(new Object[] {"a", "b", "c"}, "&"));
- assertEquals("*", StringUtils.concat(new Object[] {"*"}, "*"));
- assertEquals("***", StringUtils.concat(new Object[] {"*", "*"}, "*"));
- assertEquals("*-*", StringUtils.concat(new Object[] {"*", "*"}, "-"));
- }
-
- @Test
- public void testDefaultIfBlank() {
- assertNull(StringUtils.defaultIfBlank((String[]) null));
- assertNull(null, StringUtils.defaultIfBlank(null, ""));
- assertNull(null, StringUtils.defaultIfBlank(null, "", " "));
- assertNull(null, StringUtils.defaultIfBlank(null, "", " ", "\0"));
- assertEquals("test", StringUtils.defaultIfBlank("test", null, "", " "));
- assertEquals("test", StringUtils.defaultIfBlank(null, "", " ", "test"));
- assertEquals("test", StringUtils.defaultIfBlank(null, "", "test", " ", null));
- assertEquals("_", StringUtils.defaultIfBlank("_", null, "", " "));
- assertEquals("empty", StringUtils.defaultIfBlank(null, "", "empty", " "));
- assertEquals("blank", StringUtils.defaultIfBlank(null, "", " ", "blank"));
- assertEquals("null", StringUtils.defaultIfBlank("null", null, "", " "));
- assertEquals("null", StringUtils.defaultIfBlank("null", "empty", "blank"));
- }
@Test
public void testGetDigitsOnly() {
@@ -107,186 +60,7 @@ public class StringUtilsJUnitTest {
assertEquals("123456789", StringUtils.getDigitsOnly("123,456.789"));
}
- @Test
- public void testGetLettersOnly() {
- assertEquals("", StringUtils.getLettersOnly(null));
- assertEquals("", StringUtils.getLettersOnly(""));
- assertEquals("", StringUtils.getLettersOnly(" "));
- assertEquals("", StringUtils.getLettersOnly("123"));
- assertEquals("", StringUtils.getLettersOnly("123@$$!"));
- assertEquals("", StringUtils.getLettersOnly("!@$$%#*?"));
- assertEquals("", StringUtils.getLettersOnly("10101"));
- assertEquals("lll", StringUtils.getLettersOnly("l0l0l"));
- assertEquals("", StringUtils.getLettersOnly("007"));
- assertEquals("OO", StringUtils.getLettersOnly("OO7"));
- assertEquals("OOSeven", StringUtils.getLettersOnly("OOSeven"));
- }
-
- @Test
- public void testGetSpaces() {
- assertEquals("", StringUtils.getSpaces(0));
- assertEquals(" ", StringUtils.getSpaces(1));
- assertEquals(" ", StringUtils.getSpaces(2));
- assertEquals(" ", StringUtils.getSpaces(3));
- assertEquals(" ", StringUtils.getSpaces(4));
- assertEquals(" ", StringUtils.getSpaces(5));
- assertEquals(" ", StringUtils.getSpaces(6));
- assertEquals(" ", StringUtils.getSpaces(7));
- assertEquals(" ", StringUtils.getSpaces(8));
- assertEquals(" ", StringUtils.getSpaces(9));
- assertEquals(" ", StringUtils.getSpaces(10));
- assertEquals(" ", StringUtils.getSpaces(11));
- assertEquals(" ", StringUtils.getSpaces(12));
- assertEquals(" ", StringUtils.getSpaces(13));
- assertEquals(" ", StringUtils.getSpaces(14));
- assertEquals(" ", StringUtils.getSpaces(15));
- assertEquals(" ", StringUtils.getSpaces(16));
- assertEquals(" ", StringUtils.getSpaces(17));
- assertEquals(" ", StringUtils.getSpaces(18));
- assertEquals(" ", StringUtils.getSpaces(19));
- assertEquals(" ", StringUtils.getSpaces(20));
- assertEquals(" ", StringUtils.getSpaces(21));
- }
-
- @Test
- public void testIsBlank() {
- assertTrue(StringUtils.isBlank(null));
- assertTrue(StringUtils.isBlank(""));
- assertTrue(StringUtils.isBlank("\0"));
- assertTrue(StringUtils.isBlank(" "));
- assertTrue(StringUtils.isBlank(" "));
- }
-
- @Test
- public void testIsNotBlank() {
- assertFalse(StringUtils.isBlank("test"));
- assertFalse(StringUtils.isBlank("null"));
- assertFalse(StringUtils.isBlank("empty"));
- assertFalse(StringUtils.isBlank("_"));
- assertFalse(StringUtils.isBlank("____"));
- }
-
- @Test
- public void testIsEmpty() {
- assertTrue(StringUtils.isEmpty(""));
- }
-
- @Test
- public void testIsNotEmpty() {
- assertFalse(StringUtils.isEmpty("test"));
- assertFalse(StringUtils.isEmpty("null"));
- assertFalse(StringUtils.isEmpty("empty"));
- assertFalse(StringUtils.isEmpty(null));
- assertFalse(StringUtils.isEmpty(" "));
- assertFalse(StringUtils.isEmpty(" "));
- assertFalse(StringUtils.isEmpty("_"));
- assertFalse(StringUtils.isEmpty("___"));
- }
- @Test
- public void testPadEnding() {
- assertEquals("", StringUtils.padEnding("", 'X', 0));
- assertEquals(" ", StringUtils.padEnding(" ", 'X', 0));
- assertEquals(" ", StringUtils.padEnding(" ", 'X', 1));
- assertEquals(" ", StringUtils.padEnding(" ", 'X', 0));
- assertEquals(" ", StringUtils.padEnding(" ", 'X', 3));
- assertEquals("X", StringUtils.padEnding("", 'X', 1));
- assertEquals(" X", StringUtils.padEnding(" ", 'X', 2));
- assertEquals(" XX", StringUtils.padEnding(" ", 'X', 4));
- assertEquals("test", StringUtils.padEnding("test", 'X', 0));
- assertEquals("test", StringUtils.padEnding("test", 'X', 4));
- assertEquals("testX", StringUtils.padEnding("test", 'X', 5));
- assertEquals("testXXX", StringUtils.padEnding("test", 'X', 7));
- }
-
- @Test(expected = NullPointerException.class)
- public void testPadEndingWithNull() {
- try {
- StringUtils.padEnding(null, 'X', 10);
- } catch (NullPointerException expected) {
- assertEquals("The String value to pad cannot be null!", expected.getMessage());
- throw expected;
- }
- }
-
- @Test
- public void testToLowerCase() {
- assertNull(StringUtils.toLowerCase(null));
- assertEquals("null", StringUtils.toLowerCase("null"));
- assertEquals("null", StringUtils.toLowerCase("NULL"));
- assertEquals("", StringUtils.toLowerCase(""));
- assertEquals(" ", StringUtils.toLowerCase(" "));
- assertEquals("test", StringUtils.toLowerCase("TEST"));
- assertEquals("1", StringUtils.toLowerCase("1"));
- assertEquals("!", StringUtils.toLowerCase("!"));
- assertEquals("$00", StringUtils.toLowerCase("$00"));
- assertEquals("jon doe", StringUtils.toLowerCase("Jon Doe"));
- }
-
- @Test
- public void testToUpperCase() {
- assertNull(StringUtils.toUpperCase(null));
- assertEquals("NULL", StringUtils.toUpperCase("NULL"));
- assertEquals("NULL", StringUtils.toUpperCase("null"));
- assertEquals("", StringUtils.toUpperCase(""));
- assertEquals(" ", StringUtils.toUpperCase(" "));
- assertEquals("TEST", StringUtils.toUpperCase("test"));
- assertEquals("2", StringUtils.toUpperCase("2"));
- assertEquals("!", StringUtils.toUpperCase("!"));
- assertEquals("$00", StringUtils.toUpperCase("$00"));
- assertEquals("JON DOE", StringUtils.toUpperCase("Jon Doe"));
- }
-
- @Test
- public void testTrim() {
- assertNull(StringUtils.trim(null));
- assertEquals("", StringUtils.trim(""));
- assertEquals("", StringUtils.trim(" "));
- assertEquals("", StringUtils.trim(" "));
- assertEquals("null", StringUtils.trim("null"));
- assertEquals("test", StringUtils.trim(" test"));
- assertEquals("test", StringUtils.trim("test "));
- assertEquals("test", StringUtils.trim(" test "));
- assertEquals("a b c d", StringUtils.trim(" a b c d "));
- }
-
- @Test
- public void testTruncate() {
- assertEquals("", StringUtils.truncate("", 0));
- assertEquals("", StringUtils.truncate("", 1));
- assertEquals(" ", StringUtils.truncate(" ", 1));
- assertEquals(" ", StringUtils.truncate(" ", 5));
- assertEquals(" ", StringUtils.truncate(" ", 1));
- assertEquals("XX", StringUtils.truncate("XXX", 2));
- assertEquals("XX", StringUtils.truncate("XX", 4));
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testTruncateWithNegativeLength() {
- try {
- StringUtils.truncate("XX", -1);
- } catch (IllegalArgumentException expected) {
- assertEquals("Length must be greater than equal to 0!", expected.getMessage());
- throw expected;
- }
- }
-
- @Test
- public void testValueOf() {
- assertEquals("null", StringUtils.valueOf(null));
- assertEquals("null", StringUtils.valueOf(null, (String[]) null));
- assertEquals("null", StringUtils.valueOf(null, new String[] {}));
- assertEquals("test", StringUtils.valueOf(null, "test"));
- assertEquals("nil", StringUtils.valueOf(null, "nil", "test"));
- assertEquals("test", StringUtils.valueOf("test", (String[]) null));
- assertEquals("null", StringUtils.valueOf("null", "test"));
- assertEquals("nil", StringUtils.valueOf("nil", "mock", "test"));
- assertEquals("", StringUtils.valueOf("", "test", "mock", "null"));
- assertEquals(" ", StringUtils.valueOf(" ", "test", "mock", "nil"));
- assertEquals("true", StringUtils.valueOf(true, "test", "nil", null));
- assertEquals("1", StringUtils.valueOf(1, "one"));
- assertEquals(String.valueOf(Math.PI), StringUtils.valueOf(Math.PI, "314159"));
- }
@Test
public void testWrap() {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
index 36be8b8..c760597 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
@@ -14,7 +14,19 @@
*/
package org.apache.geode.internal.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,18 +38,11 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Vector;
import java.util.Map.Entry;
+import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
-
-import org.apache.geode.internal.lang.Filter;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import java.util.Vector;
/**
* The CollectionUtilsJUnitTest class is a test suite of test cases testing the contract and
@@ -105,7 +110,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testCreateMultipleProperties() {
- Map<String, String> map = new HashMap<String, String>(3);
+ Map<String, String> map = new HashMap<>(3);
map.put("one", "A");
map.put("two", "B");
@@ -141,7 +146,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testEmptyListWithEmptyList() {
- final List<Object> expectedList = new ArrayList<Object>(0);
+ final List<Object> expectedList = new ArrayList<>(0);
assertNotNull(expectedList);
assertTrue(expectedList.isEmpty());
@@ -174,7 +179,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testEmptySetWithEmptySet() {
- final Set<Object> expectedSet = new HashSet<Object>(0);
+ final Set<Object> expectedSet = new HashSet<>(0);
assertNotNull(expectedSet);
assertTrue(expectedSet.isEmpty());
@@ -187,7 +192,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testEmptySetWithSet() {
final Set<String> expectedSet =
- new HashSet<String>(Arrays.asList("aardvark", "baboon", "cat", "dog", "ferret"));
+ new HashSet<>(Arrays.asList("aardvark", "baboon", "cat", "dog", "ferret"));
assertNotNull(expectedSet);
assertFalse(expectedSet.isEmpty());
@@ -201,12 +206,8 @@ public class CollectionUtilsJUnitTest {
public void testFindAll() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9);
- final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() {
- // accept all even numbers
- public boolean accept(final Integer number) {
- return (number % 2 == 0);
- }
- });
+ // accept all even numbers
+ final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number % 2 == 0));
assertNotNull(matches);
assertFalse(matches.isEmpty());
@@ -217,12 +218,8 @@ public class CollectionUtilsJUnitTest {
public void testFindAllWhenMultipleElementsMatch() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 1, 4, 1, 6, 1, 7, 1, 9);
- final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() {
- // accept 1
- public boolean accept(final Integer number) {
- return (number == 1);
- }
- });
+ // accept 1
+ final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number == 1));
assertNotNull(matches);
assertEquals(5, matches.size());
@@ -233,12 +230,8 @@ public class CollectionUtilsJUnitTest {
public void testFindAllWhenNoElementsMatch() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
- final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() {
- // accept negative numbers
- public boolean accept(final Integer number) {
- return (number < 0);
- }
- });
+ // accept negative numbers
+ final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number < 0));
assertNotNull(matches);
assertTrue(matches.isEmpty());
@@ -248,12 +241,8 @@ public class CollectionUtilsJUnitTest {
public void testFindBy() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9);
- final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() {
- // accept 2
- public boolean accept(final Integer number) {
- return (number == 2);
- }
- });
+ // accept 2
+ final Integer match = CollectionUtils.findBy(numbers, number -> (number == 2));
assertNotNull(match);
assertEquals(2, match.intValue());
@@ -263,12 +252,8 @@ public class CollectionUtilsJUnitTest {
public void testFindByWhenMultipleElementsMatch() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 1, 4, 1, 6, 1, 7, 1, 9);
- final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() {
- // accept 1
- public boolean accept(final Integer number) {
- return (number == 1);
- }
- });
+ // accept 1
+ final Integer match = CollectionUtils.findBy(numbers, number -> (number == 1));
assertNotNull(match);
assertEquals(1, match.intValue());
@@ -278,19 +263,15 @@ public class CollectionUtilsJUnitTest {
public void testFindByWhenNoElementsMatch() {
final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9);
- final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() {
- // accept 10
- public boolean accept(final Integer number) {
- return (number == 10);
- }
- });
+ // accept 10
+ final Integer match = CollectionUtils.findBy(numbers, number -> (number == 10));
assertNull(match);
}
@Test
public void testRemoveKeys() {
- final Map<Object, String> expectedMap = new HashMap<Object, String>(6);
+ final Map<Object, String> expectedMap = new HashMap<>(6);
expectedMap.put("key1", "value");
expectedMap.put("key2", "null");
@@ -303,12 +284,7 @@ public class CollectionUtilsJUnitTest {
assertEquals(6, expectedMap.size());
final Map<Object, String> actualMap =
- CollectionUtils.removeKeys(expectedMap, new Filter<Map.Entry<Object, String>>() {
- @Override
- public boolean accept(final Map.Entry<Object, String> entry) {
- return !StringUtils.isBlank(entry.getValue());
- }
- });
+ CollectionUtils.removeKeys(expectedMap, entry -> StringUtils.isNotBlank(entry.getValue()));
assertSame(expectedMap, actualMap);
assertFalse(actualMap.isEmpty());
@@ -318,7 +294,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testRemoveKeysWithNullValues() {
- final Map<Object, Object> expectedMap = new HashMap<Object, Object>(3);
+ final Map<Object, Object> expectedMap = new HashMap<>(3);
expectedMap.put("one", "test");
expectedMap.put("two", null);
@@ -350,7 +326,7 @@ public class CollectionUtilsJUnitTest {
@Test
public void testRemoveKeysWithNullValuesFromMapWithNoNullValues() {
- final Map<String, Object> map = new HashMap<String, Object>(5);
+ final Map<String, Object> map = new HashMap<>(5);
map.put("one", "test");
map.put("null", "null");
@@ -430,7 +406,7 @@ public class CollectionUtilsJUnitTest {
list.add("one");
list.add("two");
- boolean modified = CollectionUtils.addAll(list, (Enumeration<String>) null);
+ boolean modified = CollectionUtils.addAll(list, null);
assertTrue(!modified);
assertEquals(2, list.size());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
index 91a59f8..7fedb9f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
@@ -14,21 +14,12 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.junit.Assert.*;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collections;
-import java.util.Set;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.concurrent.Synchroniser;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
@@ -41,6 +32,19 @@ import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.MemberNotFoundException;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.lib.concurrent.Synchroniser;
+import org.jmock.lib.legacy.ClassImposteriser;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.Set;
/**
* The AbstractCommandsSupportJUnitTest class is a test suite of test cases testing the contract and
@@ -140,9 +144,9 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testConvertDefaultValue() {
- assertNull(AbstractCommandsSupport.convertDefaultValue(null, StringUtils.EMPTY_STRING));
- assertEquals(StringUtils.EMPTY_STRING,
- AbstractCommandsSupport.convertDefaultValue(StringUtils.EMPTY_STRING, "test"));
+ assertNull(AbstractCommandsSupport.convertDefaultValue(null, StringUtils.EMPTY));
+ assertEquals(StringUtils.EMPTY,
+ AbstractCommandsSupport.convertDefaultValue(StringUtils.EMPTY, "test"));
assertEquals(StringUtils.SPACE,
AbstractCommandsSupport.convertDefaultValue(StringUtils.SPACE, "testing"));
assertEquals("tested", AbstractCommandsSupport
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 8bf1c43..5ff0a67 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -14,14 +14,27 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.cache.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertSame;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexStatistics;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.internal.lang.MutableIdentifiable;
import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
@@ -34,15 +47,17 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the
* index-based GemFire shell (Gfsh) commands.
@@ -57,7 +72,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
private static final int DEFAULT_REGION_INITIAL_CAPACITY = 10000;
- private final AtomicLong idGenerator = new AtomicLong(0l);
+ private final AtomicLong idGenerator = new AtomicLong(0L);
@Override
public final void postSetUpCliCommandTestBase() throws Exception {
@@ -186,7 +201,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
final Random random = new Random(System.currentTimeMillis());
int count = 0;
- final List<Proxy> proxies = new ArrayList<Proxy>();
+ final List<Proxy> proxies = new ArrayList<>();
Consumer consumer;
Proxy proxy;
@@ -232,7 +247,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
final Random random = new Random(System.currentTimeMillis());
int count = 0;
- final List<Proxy> proxies = new ArrayList<Proxy>();
+ final List<Proxy> proxies = new ArrayList<>();
Producer producer;
Proxy proxy;
@@ -322,7 +337,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
private final Properties distributedSystemProperties;
- private final Set<RegionDefinition> regions = new HashSet<RegionDefinition>();
+ private final Set<RegionDefinition> regions = new HashSet<>();
private final VM vm;
@@ -471,14 +486,14 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
private final Class<?> keyConstraint;
private final Class<?> valueConstraint;
- private final Set<Index> indexes = new HashSet<Index>();
+ private final Set<Index> indexes = new HashSet<>();
private final String regionName;
@SuppressWarnings("unchecked")
protected RegionDefinition(final String regionName, final Class<?> keyConstraint,
final Class<?> valueConstraint) {
- assert !StringUtils.isBlank(regionName) : "The name of the Region must be specified!";
+ assert StringUtils.isNotBlank(regionName) : "The name of the Region must be specified!";
this.regionName = regionName;
this.keyConstraint = ObjectUtils.defaultIfNull(keyConstraint, Object.class);
this.valueConstraint = ObjectUtils.defaultIfNull(valueConstraint, Object.class);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
index fc920c4..cea77fa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
@@ -21,14 +21,13 @@ import static java.util.stream.Collectors.toSet;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.DeployedJar;
-import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.test.dunit.rules.Locator;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
@@ -41,7 +40,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -93,7 +91,7 @@ public class ClusterConfig implements Serializable {
Set<String> expectedGroupConfigs =
this.getGroups().stream().map(ConfigGroup::getName).collect(toSet());
- // verify info exists in memeory
+ // verify info exists in memory
locatorVM.invoke(() -> {
InternalLocator internalLocator = LocatorServerStartupRule.locatorStarter.getLocator();
ClusterConfigurationService sc = internalLocator.getSharedConfiguration();
@@ -107,8 +105,8 @@ public class ClusterConfig implements Serializable {
Configuration config = sc.getConfiguration(configGroup.name);
assertThat(config.getJarNames()).isEqualTo(configGroup.getJars());
- // verify proeprty is as expected
- if (!StringUtils.isBlank(configGroup.getMaxLogFileSize())) {
+ // verify property is as expected
+ if (StringUtils.isNotBlank(configGroup.getMaxLogFileSize())) {
Properties props = config.getGemfireProperties();
assertThat(props.getProperty(LOG_FILE_SIZE_LIMIT))
.isEqualTo(configGroup.getMaxLogFileSize());
@@ -135,7 +133,7 @@ public class ClusterConfig implements Serializable {
}
}
- public void verifyServer(MemberVM<Server> serverVM) throws ClassNotFoundException {
+ public void verifyServer(MemberVM<Server> serverVM) {
// verify files exist in filesystem
Set<String> expectedJarNames = this.getJarNames().stream().collect(toSet());
@@ -156,7 +154,7 @@ public class ClusterConfig implements Serializable {
assertThat(cache.getRegion(region)).isNotNull();
}
- if (!StringUtils.isBlank(this.getMaxLogFileSize())) {
+ if (StringUtils.isNotBlank(this.getMaxLogFileSize())) {
Properties props = cache.getDistributedSystem().getProperties();
assertThat(props.getProperty(LOG_FILE_SIZE_LIMIT)).isEqualTo(this.getMaxLogFileSize());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
index 19a1662..bc709db 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
@@ -17,7 +17,7 @@ package org.apache.geode.test.dunit.rules;
import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.HeadlessGfsh;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index b2be12a..033fedc 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache.lucene.internal.cli;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
@@ -28,7 +29,6 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFun
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.CliMetaData;
@@ -82,11 +82,10 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliCommand(value = LuceneCliStrings.LUCENE_LIST_INDEX,
help = LuceneCliStrings.LUCENE_LIST_INDEX__HELP)
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result listIndex(@CliOption(key = LuceneCliStrings.LUCENE_LIST_INDEX__STATS,
- mandatory = false, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false",
+ specifiedDefaultValue = "true", unspecifiedDefaultValue = "false",
help = LuceneCliStrings.LUCENE_LIST_INDEX__STATS__HELP) final boolean stats) {
try {
@@ -120,7 +119,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
List<LuceneIndexDetails> sortedResults =
results.stream().flatMap(set -> set.stream()).sorted().collect(Collectors.toList());
- LinkedHashSet<LuceneIndexDetails> uniqResults = new LinkedHashSet<LuceneIndexDetails>();
+ LinkedHashSet<LuceneIndexDetails> uniqResults = new LinkedHashSet<>();
uniqResults.addAll(sortedResults);
sortedResults.clear();
sortedResults.addAll(uniqResults);
@@ -137,10 +136,9 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
indexData.accumulate("Server Name", indexDetails.getServerName());
indexData.accumulate("Indexed Fields", indexDetails.getSearchableFieldNamesString());
indexData.accumulate("Field Analyzer", indexDetails.getFieldAnalyzersString());
- indexData.accumulate("Status",
- indexDetails.getInitialized() == true ? "Initialized" : "Defined");
+ indexData.accumulate("Status", indexDetails.getInitialized() ? "Initialized" : "Defined");
- if (stats == true) {
+ if (stats) {
if (!indexDetails.getInitialized()) {
indexData.accumulate("Query Executions", "NA");
indexData.accumulate("Updates", "NA");
@@ -164,8 +162,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliCommand(value = LuceneCliStrings.LUCENE_CREATE_INDEX,
help = LuceneCliStrings.LUCENE_CREATE_INDEX__HELP)
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
// TODO : Add optionContext for indexName
public Result createIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true,
help = LuceneCliStrings.LUCENE_CREATE_INDEX__NAME__HELP) final String indexName,
@@ -177,11 +174,10 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD, mandatory = true,
help = LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD_HELP) final String[] fields,
- @CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER, mandatory = false,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
+ @CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER,
help = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER_HELP) final String[] analyzers) {
- Result result = null;
+ Result result;
XmlEntity xmlEntity = null;
this.securityService.authorizeRegionManage(regionPath);
@@ -222,8 +218,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliCommand(value = LuceneCliStrings.LUCENE_DESCRIBE_INDEX,
help = LuceneCliStrings.LUCENE_DESCRIBE_INDEX__HELP)
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result describeIndex(
@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true,
@@ -262,8 +257,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliCommand(value = LuceneCliStrings.LUCENE_SEARCH_INDEX,
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__HELP)
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@ResourceOperation(resource = Resource.DATA, operation = Operation.WRITE)
public Result searchIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true,
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__NAME__HELP) final String indexName,
@@ -278,15 +272,14 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__DEFAULT_FIELD, mandatory = true,
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__DEFAULT_FIELD__HELP) final String defaultField,
- @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT, mandatory = false,
- unspecifiedDefaultValue = "-1",
+ @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT, unspecifiedDefaultValue = "-1",
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT__HELP) final int limit,
- @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE, mandatory = false,
+ @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE,
unspecifiedDefaultValue = "-1",
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE__HELP) int pageSize,
- @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY, mandatory = false,
+ @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY,
unspecifiedDefaultValue = "false",
help = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY__HELP) boolean keysOnly) {
try {
@@ -315,11 +308,9 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
@CliCommand(value = LuceneCliStrings.LUCENE_DESTROY_INDEX,
help = LuceneCliStrings.LUCENE_DESTROY_INDEX__HELP)
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
- public Result destroyIndex(
- @CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = false,
- help = LuceneCliStrings.LUCENE_DESTROY_INDEX__NAME__HELP) final String indexName,
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
+ public Result destroyIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME,
+ help = LuceneCliStrings.LUCENE_DESTROY_INDEX__NAME__HELP) final String indexName,
@CliOption(key = LuceneCliStrings.LUCENE__REGION_PATH, mandatory = true,
optionContext = ConverterHint.REGION_PATH,
@@ -329,7 +320,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__REGION_CANNOT_BE_EMPTY));
}
- if (StringUtils.isEmpty(indexName)) {
+ if (indexName != null && StringUtils.isEmpty(indexName)) {
return ResultBuilder.createInfoResult(
CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__INDEX_CANNOT_BE_EMPTY));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
index f7edd8f..a5ec7d5 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java
@@ -15,6 +15,7 @@
package org.apache.geode.cache.lucene.internal.cli.functions;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
@@ -26,12 +27,10 @@ import org.apache.geode.cache.lucene.internal.cli.LuceneCliStrings;
import org.apache.geode.cache.lucene.internal.cli.LuceneIndexDetails;
import org.apache.geode.cache.lucene.internal.cli.LuceneIndexInfo;
import org.apache.geode.internal.InternalEntity;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index d4dca4a..143e99d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -14,32 +14,18 @@
*/
package org.apache.geode.cache.lucene.internal.cli;
-import static org.junit.Assert.*;
+import static junit.framework.TestCase.assertSame;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.ResultCollector;
@@ -60,6 +46,25 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
/**
* The LuceneIndexCommandsJUnitTest class is a test suite of test cases testing the contract and
@@ -409,7 +414,7 @@ public class LuceneIndexCommandsJUnitTest {
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
- String expectedStatus = null;
+ String expectedStatus;
if (expectedToSucceed) {
expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEX_0_FROM_REGION_1,
@@ -446,7 +451,7 @@ public class LuceneIndexCommandsJUnitTest {
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
- String expectedStatus = null;
+ String expectedStatus;
if (expectedToSucceed) {
expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEX_0_FROM_REGION_1,
@@ -478,7 +483,7 @@ public class LuceneIndexCommandsJUnitTest {
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
- String expectedStatus = null;
+ String expectedStatus;
if (expectedToSucceed) {
expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEXES_FROM_REGION_0,
@@ -515,7 +520,7 @@ public class LuceneIndexCommandsJUnitTest {
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
- String expectedStatus = null;
+ String expectedStatus;
if (expectedToSucceed) {
expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEXES_FROM_REGION_0,
@@ -564,8 +569,8 @@ public class LuceneIndexCommandsJUnitTest {
}
// Verify each status
List<String> status = data.retrieveAllValues("Status");
- for (int i = 0; i < status.size(); i++) {
- assertEquals(expectedStatus, status.get(i));
+ for (String statu : status) {
+ assertEquals(expectedStatus, statu);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
index 6ee5b53..7ce9c46 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
@@ -34,7 +34,6 @@ import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Server;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -57,7 +56,7 @@ public class PropMockDataUpdater implements IClusterUpdater {
private Cluster cluster = null;
private TestBed testbed;
- private final String testbedFile = System.getProperty("pulse.propMockDataUpdaterFile");;
+ private final String testbedFile = System.getProperty("pulse.propMockDataUpdaterFile");
private final ObjectMapper mapper = new ObjectMapper();
@@ -65,14 +64,12 @@ public class PropMockDataUpdater implements IClusterUpdater {
this.cluster = cluster;
try {
loadPropertiesFile();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
- private void loadPropertiesFile() throws FileNotFoundException, IOException {
+ private void loadPropertiesFile() throws IOException {
this.testbed = new TestBed(testbedFile, true);
}
@@ -161,8 +158,8 @@ public class PropMockDataUpdater implements IClusterUpdater {
}
for (Entry<String, Member> memberSet : membersHMap.entrySet()) {
- HashMap<String, Cluster.Region> memberRegions = new HashMap<String, Cluster.Region>();
- HashMap<String, Cluster.Client> memberClientsHM = new HashMap<String, Cluster.Client>();
+ HashMap<String, Cluster.Region> memberRegions = new HashMap<>();
+ HashMap<String, Cluster.Client> memberClientsHM = new HashMap<>();
Random randomGenerator = new Random();
@@ -277,10 +274,6 @@ public class PropMockDataUpdater implements IClusterUpdater {
memberRegion.setWanEnabled(false);
}
memberRegion.setWanEnabled(true);
- /*
- * memberRegion.setSystemRegionEntryCount(Long.valueOf(String.valueOf(Math
- * .abs(randomGenerator.nextInt(100)))));
- */
memberRegion.getMemberName().add(memName);
memberRegion.setMemberCount(memberCount);
return memberRegion;
@@ -369,7 +362,7 @@ public class PropMockDataUpdater implements IClusterUpdater {
if (memberArrList != null) {
memberArrList.add(m);
} else {
- ArrayList<Cluster.Member> memberList = new ArrayList<Cluster.Member>();
+ ArrayList<Cluster.Member> memberList = new ArrayList<>();
memberList.add(m);
physicalToMember.put(m.getHost(), memberList);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java
index 096e4d5..7407cc8 100644
--- a/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java
+++ b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java
@@ -16,25 +16,24 @@
*/
package org.apache.geode.spark.connector.internal.geodefunctions;
-import java.util.Iterator;
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
-import org.apache.geode.internal.cache.*;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.internal.cache.execute.InternalResultSender;
import org.apache.geode.internal.cache.partitioned.PREntriesIterator;
import org.apache.geode.internal.logging.LogService;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Iterator;
/**
* GemFire function that is used by `SparkContext.geodeRegion(regionPath, whereClause)`
@@ -85,10 +84,11 @@ public class RetrieveRegionFunction implements Function {
InternalRegionFunctionContext irfc = (InternalRegionFunctionContext) context;
LocalRegion localRegion = (LocalRegion) irfc.getDataSet();
boolean partitioned = localRegion.getDataPolicy().withPartitioning();
- if (where.trim().isEmpty())
+ if (StringUtils.isBlank(where)) {
retrieveFullRegion(irfc, partitioned, taskDesc);
- else
+ } else {
retrieveRegionWithWhereClause(irfc, localRegion, partitioned, where, taskDesc);
+ }
}
/** ------------------------------------------ */
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java
index eac0b8d..73be12a 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java
@@ -14,6 +14,9 @@
*/
package org.apache.geode.management.internal.web;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.management.internal.web.domain.Link;
+
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -22,9 +25,6 @@ import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.management.internal.web.domain.Link;
-
/**
* The AbstractWebDomainTests class is abstract base class containing functionality common to a test
* suite classes in the org.apache.geode.management.internal.web.domain package.
@@ -48,7 +48,7 @@ public abstract class AbstractWebTestCase {
assert values != null : "The Values for the Map cannot be null!";
assert keys.length == values.length;
- final Map<K, V> map = new HashMap<K, V>(keys.length);
+ final Map<K, V> map = new HashMap<>(keys.length);
int index = 0;
for (final K key : keys) {
@@ -59,11 +59,11 @@ public abstract class AbstractWebTestCase {
}
protected String decode(final String encodedValue) throws UnsupportedEncodingException {
- return URLDecoder.decode(encodedValue, StringUtils.UTF_8);
+ return URLDecoder.decode(encodedValue, "UTF-8");
}
protected String encode(final String value) throws UnsupportedEncodingException {
- return URLEncoder.encode(value, StringUtils.UTF_8);
+ return URLEncoder.encode(value, "UTF-8");
}
protected String toString(final Link... links) throws UnsupportedEncodingException {
@@ -71,7 +71,7 @@ public abstract class AbstractWebTestCase {
int count = 0;
for (final Link link : links) {
- buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY_STRING).append(toString(link));
+ buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY).append(toString(link));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
index 37ec508..10e26f6 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
@@ -14,17 +14,18 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
+import org.apache.geode.management.internal.web.domain.Link;
+import org.apache.geode.management.internal.web.domain.LinkIndex;
+import org.apache.geode.management.internal.web.util.UriUtils;
+import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,12 +38,14 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import org.apache.geode.management.cli.CliMetaData;
-import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
-import org.apache.geode.management.internal.web.domain.Link;
-import org.apache.geode.management.internal.web.domain.LinkIndex;
-import org.apache.geode.management.internal.web.util.UriUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
/**
* The ShellCommandsControllerJUnitTest class is a test suite of test cases testing the contract and
@@ -123,8 +126,7 @@ public class ShellCommandsControllerJUnitTest {
String[] requestParameters = requestMappingAnnotation.params();
if (requestParameters.length > 0) {
- webServiceEndpoint += "?".concat(
- org.apache.geode.internal.lang.StringUtils.concat(requestParameters, "&"));
+ webServiceEndpoint += "?".concat(StringUtils.join(requestParameters, "&"));
}
controllerWebServiceEndpoints.add(webServiceEndpoint);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
index c69013b..2bebd2e 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.management.internal.cli.CommandRequest;
import org.apache.geode.management.internal.web.AbstractWebTestCase;
import org.apache.geode.management.internal.web.domain.Link;
@@ -112,7 +112,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
private CommandRequest createCommandRequest(final String command,
final Map<String, String> options) {
- return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(), null);
+ return new TestCommandRequest(command, options, Collections.emptyMap(), null);
}
private CommandRequest createCommandRequest(final String command,
@@ -122,8 +122,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
private CommandRequest createCommandRequest(final String command,
final Map<String, String> options, final byte[][] fileData) {
- return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(),
- fileData);
+ return new TestCommandRequest(command, options, Collections.emptyMap(), fileData);
}
private CommandRequest createCommandRequest(final String command,
@@ -145,12 +144,12 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
@Test
public void testCreateHttpRequest() {
- final Map<String, String> commandOptions = new HashMap<String, String>();
+ final Map<String, String> commandOptions = new HashMap<>();
commandOptions.put("author", "Adams");
commandOptions.put("blankOption", " ");
commandOptions.put("category", "sci-fi");
- commandOptions.put("emptyOption", StringUtils.EMPTY_STRING);
+ commandOptions.put("emptyOption", StringUtils.EMPTY);
commandOptions.put("isbn", "0-123456789");
commandOptions.put("nullOption", null);
commandOptions.put("title", "Hitch Hiker's Guide to the Galaxy");
@@ -182,12 +181,12 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
@Test
public void testCreateHttpRequestWithEnvironmentVariables() {
- final Map<String, String> commandOptions = new HashMap<String, String>(2);
+ final Map<String, String> commandOptions = new HashMap<>(2);
commandOptions.put("name", "ElLibreDeCongress");
commandOptions.put("isbn", "${ISBN}");
- final Map<String, String> environment = new HashMap<String, String>(2);
+ final Map<String, String> environment = new HashMap<>(2);
environment.put("ISBN", "0-987654321");
environment.put("VAR", "test");
@@ -209,7 +208,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
}
@Test
- public void testCreatHttpRequestWithFileData() {
+ public void testCreateHttpRequestWithFileData() {
final Map<String, String> commandOptions = Collections.singletonMap("isbn", "0-123456789");
final byte[][] fileData = {"/path/to/book/content.txt".getBytes(),
@@ -238,7 +237,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
@Test
public void testFindAndResolveLink() throws Exception {
- final Map<String, String> commandOptions = new HashMap<String, String>();
+ final Map<String, String> commandOptions = new HashMap<>();
commandOptions.put("name", "BarnesN'Noble");
@@ -253,7 +252,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
assertNotNull(link);
assertEquals("http://host.domain.com/service/v1/libraries/{name}", toString(link.getHref()));
- commandOptions.put("author", "J.K.Rowlings");
+ commandOptions.put("author", "J.K.Rowling");
link = getOperationInvoker().findLink(createCommandRequest("list-books", commandOptions));
@@ -323,8 +322,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
}
};
- final Object actualResult = operationInvoker.processCommand(
- createCommandRequest("list-libraries", Collections.<String, String>emptyMap()));
+ final Object actualResult = operationInvoker
+ .processCommand(createCommandRequest("list-libraries", Collections.emptyMap()));
assertEquals(expectedResult, actualResult);
}
@@ -353,8 +352,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
protected void printWarning(final String message, final Object... args) {}
};
- final Object actualResult = operationInvoker.processCommand(
- createCommandRequest("get resource", Collections.<String, String>emptyMap()));
+ final Object actualResult = operationInvoker
+ .processCommand(createCommandRequest("get resource", Collections.emptyMap()));
assertEquals(expectedResult, actualResult);
}
@@ -391,8 +390,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
+ "Please try reconnecting or see the GemFire Manager's log file for further details.",
operationInvoker.getBaseUrl(), "test");
- final Object actualResult = operationInvoker.processCommand(
- createCommandRequest("list-libraries", Collections.<String, String>emptyMap()));
+ final Object actualResult = operationInvoker
+ .processCommand(createCommandRequest("list-libraries", Collections.emptyMap()));
assertFalse(operationInvoker.isConnected());
assertEquals(expectedResult, actualResult);
@@ -413,8 +412,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
};
try {
- operationInvoker.processCommand(
- createCommandRequest("get resource", Collections.<String, String>emptyMap()));
+ operationInvoker.processCommand(createCommandRequest("get resource", Collections.emptyMap()));
} catch (RestApiCallForCommandNotFoundException e) {
assertEquals("No REST API call for command (get resource) was found!", e.getMessage());
throw e;
@@ -425,7 +423,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
public void testProcessCommandWhenNotConnected() {
try {
getOperationInvoker()
- .processCommand(createCommandRequest("get-book", Collections.<String, String>emptyMap()));
+ .processCommand(createCommandRequest("get-book", Collections.emptyMap()));
} catch (IllegalStateException e) {
assertEquals(
"Gfsh must be connected to the GemFire Manager in order to process commands remotely!",
@@ -436,7 +434,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase {
private static class TestCommandRequest extends CommandRequest {
- private final Map<String, String> commandParameters = new TreeMap<String, String>();
+ private final Map<String, String> commandParameters = new TreeMap<>();
private final String command;
[64/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
index 870e778..44171e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -224,8 +224,8 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
}
}
- protected final boolean operateOnDistributedRegion(final DistributionManager dm,
- DistributedRegion r) throws ForceReattemptException {
+ protected boolean operateOnDistributedRegion(final DistributionManager dm, DistributedRegion r)
+ throws ForceReattemptException {
if (this.functionObject == null) {
ReplyMessage.send(getSender(), this.processorId,
new ReplyException(new FunctionException(
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 42bf10f..e236f80 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import java.io.DataInput;
@@ -21,7 +20,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.apache.logging.log4j.Logger;
@@ -41,7 +39,6 @@ import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
-import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllEntryData;
import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
@@ -59,13 +56,12 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
/**
* Handles distribution of a Region.removeAll operation.
+ *
+ * TODO: extend DistributedCacheOperation instead of AbstractUpdateOperation
*
* @since GemFire 8.1
*/
-public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TODO extend
- // DistributedCacheOperation
- // instead
-{
+public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
private static final Logger logger = LogService.getLogger();
/**
@@ -247,7 +243,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO
}
}
- public final EntryEventImpl getBaseEvent() {
+ public EntryEventImpl getBaseEvent() {
return getEvent();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 1d65579..3048e52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -307,7 +307,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
* whenever we try to schedule more expiration tasks.
*/
@Override
- public final void run2() {
+ public void run2() {
try {
if (executor != null) {
executor.execute(new Runnable() {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 4ed583a..c813a80 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4317,7 +4317,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
@Override
- public final InternalResourceManager getInternalResourceManager() {
+ public InternalResourceManager getInternalResourceManager() {
return getInternalResourceManager(true);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
index 8d28a53..f2be3c0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
@@ -271,24 +271,24 @@ public abstract class GridAdvisor extends DistributionAdvisor {
finishInit();
}
- public final void setHost(String host) {
+ public void setHost(String host) {
this.host = host;
}
- public final void setPort(int port) {
+ public void setPort(int port) {
this.port = port;
}
- public final String getHost() {
+ public String getHost() {
return this.host;
}
- public final int getPort() {
+ public int getPort() {
return this.port;
}
@Override
- public final ProfileId getId() {
+ public ProfileId getId() {
if (this.id == null)
throw new IllegalStateException("profile id not yet initialized");
return this.id;
@@ -300,7 +300,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
*
* @since GemFire 5.7
*/
- protected final void tellLocalControllers(boolean removeProfile, boolean exchangeProfiles,
+ protected void tellLocalControllers(boolean removeProfile, boolean exchangeProfiles,
final List<Profile> replyProfiles) {
final List<Locator> locators = Locator.getLocators();
for (int i = 0; i < locators.size(); i++) {
@@ -325,7 +325,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
*
* @since GemFire 5.7
*/
- protected final void tellLocalBridgeServers(boolean removeProfile, boolean exchangeProfiles,
+ protected void tellLocalBridgeServers(boolean removeProfile, boolean exchangeProfiles,
final List<Profile> replyProfiles) {
final InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index fb5f0cf..82df980 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -1515,7 +1515,7 @@ public class InitialImageOperation {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return this.targetReinitialized ? DistributionManager.WAITING_POOL_EXECUTOR
: DistributionManager.HIGH_PRIORITY_EXECUTOR;
}
@@ -2160,7 +2160,7 @@ public class InitialImageOperation {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.HIGH_PRIORITY_EXECUTOR;
}
@@ -2431,7 +2431,7 @@ public class InitialImageOperation {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return this.targetReinitialized ? DistributionManager.WAITING_POOL_EXECUTOR
: DistributionManager.HIGH_PRIORITY_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
index 3a0bf8e..617001f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java
@@ -375,7 +375,7 @@ public class MemberFunctionStreamingMessage extends DistributionMessage
return this.txUniqId;
}
- public final InternalDistributedMember getMemberToMasqueradeAs() {
+ public InternalDistributedMember getMemberToMasqueradeAs() {
if (txMemberId == null) {
return getSender();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
index 805b900..a6bb959 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache;
import java.io.DataInput;
@@ -40,6 +37,7 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
+
private long lastModified;
private boolean isRemoved;
private Object key;
@@ -291,7 +289,7 @@ public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
.toLocalizedString());
}
- public final Object getValueInVM(RegionEntryContext context) {
+ public Object getValueInVM(RegionEntryContext context) {
return this.value;
}
@@ -360,7 +358,7 @@ public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
return false;
}
- public final Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
+ public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) {
return this.value;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index b171a95..037bff6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -252,16 +252,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
return numPrimaries.get();
}
-
- /**
- * Indicates if this data store is managing buckets
- *
- * @return true if it is managing buckets
- */
- final boolean isManagingAnyBucket() {
- return !this.localBucket2RegionMap.isEmpty();
- }
-
/**
* Try to grab buckets for all the colocated regions /* In case we can't grab buckets there is no
* going back
@@ -872,55 +862,20 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
event.getRegion().getFullPath(), event.getKey(), event.getDistributedMember());
}
- public final void afterRegionInvalidate(RegionEvent event) {}
+ public void afterRegionInvalidate(RegionEvent event) {}
- public final void afterRegionDestroy(RegionEvent event) {}
+ public void afterRegionDestroy(RegionEvent event) {}
- public final void afterRegionClear(RegionEvent event) {}
+ public void afterRegionClear(RegionEvent event) {}
- public final void afterRegionCreate(RegionEvent event) {}
+ public void afterRegionCreate(RegionEvent event) {}
- public final void afterRegionLive(RegionEvent event) {}
+ public void afterRegionLive(RegionEvent event) {}
- public final void close() {}
+ public void close() {}
};
}
- // private void addBucketMapping(Integer bucketId, Node theNode)
- // {
- // VersionedArrayList list = (VersionedArrayList)this.partitionedRegion
- // .getBucket2Node().get(bucketId);
- // // Create a new list to avoid concurrent modification exceptions when
- // // the array list is serialized e.g. GII
- // if (list == null) {
- // list = new VersionedArrayList(
- // this.partitionedRegion.getRedundantCopies() + 1);
- // list.add(theNode);
- //
- // }
- // else {
- // for(Iterator itr =list.iterator(); itr.hasNext();) {
- // Node nd = (Node)itr.next();
- // if( !PartitionedRegionHelper.isMemberAlive(nd.getMemberId(),
- // this.partitionedRegion.cache)
- // && !this.partitionedRegion.isPresentInPRConfig(nd)) {
- // list.remove(nd);
- // if(list.size() ==0 ) {
- // PartitionedRegionHelper.logForDataLoss(this.partitionedRegion,
- // bucketId.intValue(), "addBucketMapping");
- // }
- // }
- //
- // }
- // if (!list.contains(theNode)) {
- // list.add(theNode);
- // }
- // }
- // this.partitionedRegion.checkClosed();
- // this.partitionedRegion.checkReadiness();
- // this.partitionedRegion.getBucket2Node().put(bucketId, list);
- // }
-
public CacheLoader getCacheLoader() {
return this.loader;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
index 097ca41..a06c437 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java
@@ -28,10 +28,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* thrown away and a real DiskRegion instance will replace it. This class needs to keep track of any
* information that can be recovered from the DiskInitFile.
*
- *
* @since GemFire prPersistSprint2
*/
public class PlaceHolderDiskRegion extends AbstractDiskRegion implements DiskRecoveryStore {
+
private final String name;
/**
@@ -59,7 +59,7 @@ public class PlaceHolderDiskRegion extends AbstractDiskRegion implements DiskRec
}
@Override
- public final String getName() {
+ public String getName() {
return this.name;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
index cfc9fdd..ab90a05 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -218,7 +218,7 @@ public class ProxyBucketRegion implements Bucket {
return this.partitionedRegion.getAttributes();
}
- public final BucketAdvisor getBucketAdvisor() {
+ public BucketAdvisor getBucketAdvisor() {
return this.advisor;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
index 913836a..0c141cc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import java.io.DataInput;
@@ -94,11 +93,6 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
return p;
}
- // final public int getProcessorType()
- // {
- // return DistributionManager.PARTITIONED_REGION_EXECUTOR;
- // }
-
@Override
public boolean isSevereAlertCompatible() {
// allow forced-disconnect processing for all cache op messages
@@ -106,7 +100,7 @@ public class RemoteFetchEntryMessage extends RemoteOperationMessage {
}
@Override
- protected final boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
+ protected boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
throws RemoteOperationException {
// RemoteFetchEntryMessage is used in refreshing client caches during interest list recovery,
// so don't be too verbose or hydra tasks may time out
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 0e9f8c5..f029c31 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
@@ -55,7 +55,6 @@ import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.annotations.Released;
@@ -232,7 +231,7 @@ public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.eventId = (EventID) DataSerializer.readObject(in);
this.callbackArg = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 d4d4c26..4b51705 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
@@ -225,7 +225,7 @@ public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectRepl
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.eventId = (EventID) DataSerializer.readObject(in);
this.callbackArg = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
index 3ad1137..e093d95 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
@@ -303,7 +303,7 @@ public class StateFlushOperation {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return processorType;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
index 95c2cc2..8acc63b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEvent.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import org.apache.geode.cache.*;
@@ -20,14 +19,12 @@ import java.util.*;
import org.apache.geode.internal.offheap.Releasable;
/**
- * <p>
* The internal implementation of the {@link TransactionEvent} interface
- *
*
* @since GemFire 4.0
- *
*/
public class TXEvent implements TransactionEvent, Releasable {
+
private final TXStateInterface localTxState;
private List events;
private List createEvents = null;
@@ -147,7 +144,7 @@ public class TXEvent implements TransactionEvent, Releasable {
return true;
}
- public final Cache getCache() {
+ public Cache getCache() {
return this.cache;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
index 32fe284..ffc0758 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import org.apache.geode.internal.ExternalizableDSFID;
@@ -25,16 +24,15 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* The implementation of the {@link TransactionId} interface stored in the transaction state and
- * used, amoung other things, to uniquely identify a transaction in a confederation of transaction
+ * used, among other things, to uniquely identify a transaction in a confederation of transaction
* participants (currently VM in a Distributed System).
*
- *
* @since GemFire 4.0
- *
* @see TXManagerImpl#begin
* @see org.apache.geode.cache.CacheTransactionManager#getTransactionId
*/
public class TXId extends ExternalizableDSFID implements TransactionId {
+
/** The domain of a transaction, currently the VM's unique identifier */
private InternalDistributedMember memberId;
/** Per unique identifier within the transactions memberId */
@@ -104,7 +102,7 @@ public class TXId extends ExternalizableDSFID implements TransactionId {
this.memberId = DSFIDFactory.readInternalDistributedMember(in);
}
- public static final TXId createFromData(DataInput in) throws IOException, ClassNotFoundException {
+ public static TXId createFromData(DataInput in) throws IOException, ClassNotFoundException {
TXId result = new TXId();
InternalDataSerializer.invokeFromData(result, in);
return result;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
index 24cbaa2..2e991e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
@@ -185,7 +185,7 @@ public abstract class TXMessage extends SerialDistributionMessage
this.txMemberId = DataSerializer.readObject(in);
}
- public final InternalDistributedMember getMemberToMasqueradeAs() {
+ public InternalDistributedMember getMemberToMasqueradeAs() {
if (txMemberId == null) {
return getSender();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 6a6e9ad..2c8c28b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import java.util.ArrayList;
@@ -32,7 +31,6 @@ import javax.transaction.Status;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
-import org.apache.geode.InternalGemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CommitConflictException;
@@ -68,9 +66,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
* TXState is the entity that tracks the transaction state on a per thread basis, noting changes to
* Region entries on a per operation basis. It lives on the node where transaction data exists.
*
- *
* @since GemFire 4.0
- *
* @see TXManagerImpl
*/
public class TXState implements TXStateInterface {
@@ -1204,16 +1200,6 @@ public class TXState implements TXStateInterface {
return readRegion(localRegion);
}
-
- final TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, boolean ifNew,
- boolean requireOldValue) {
- try {
- return txWriteEntry(region, event, ifNew, requireOldValue, null);
- } catch (EntryNotFoundException e) {
- throw new InternalGemFireException("caught unexpected exception", e);
- }
- }
-
/**
* @param requireOldValue if true set the old value in the event, even if ifNew and entry doesn't
* currently exist (this is needed for putIfAbsent).
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
index 5dd624b..6055705 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java
@@ -12,9 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- * File comment
- */
package org.apache.geode.internal.cache;
import java.util.Collection;
@@ -46,10 +43,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* TXStateStub lives on the accessor node when we are remoting a transaction. It is a stub for
* {@link TXState}.
- *
- *
*/
public abstract class TXStateStub implements TXStateInterface {
+
protected final DistributedMember target;
protected final TXStateProxy proxy;
protected Runnable internalAfterSendRollback;
@@ -57,11 +53,6 @@ public abstract class TXStateStub implements TXStateInterface {
Map<Region<?, ?>, TXRegionStub> regionStubs = new HashMap<Region<?, ?>, TXRegionStub>();
-
- /**
- * @param stateProxy
- * @param target
- */
protected TXStateStub(TXStateProxy stateProxy, DistributedMember target) {
this.target = target;
this.proxy = stateProxy;
@@ -113,8 +104,6 @@ public abstract class TXStateStub implements TXStateInterface {
}
}
-
-
/**
* Get or create a TXRegionStub for the given region. For regions that are new to the tx, we
* validate their eligibility.
@@ -122,7 +111,7 @@ public abstract class TXStateStub implements TXStateInterface {
* @param region The region to involve in the tx.
* @return existing or new stub for region
*/
- protected final TXRegionStub getTXRegionStub(LocalRegion region) {
+ protected TXRegionStub getTXRegionStub(LocalRegion region) {
TXRegionStub stub = regionStubs.get(region);
if (stub == null) {
/*
@@ -139,7 +128,6 @@ public abstract class TXStateStub implements TXStateInterface {
return this.regionStubs;
}
-
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
index 3c0dd9b..b53d498 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMStatsDiskLRURegionEntryHeap extends VMStatsDiskLRURegionEntry {
+
public VMStatsDiskLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMStatsDiskLRURegionEntryHeap extends VMStatsDiskLRURegion
}
private static class VMStatsDiskLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsDiskLRURegionEntryHeap extends VMStatsDiskLRURegion
return new VMStatsDiskLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsDiskLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
index d8f5083..c14b15a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMStatsDiskLRURegionEntryOffHeap extends VMStatsDiskLRURegionEntry
implements OffHeapRegionEntry {
+
public VMStatsDiskLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMStatsDiskLRURegionEntryOffHeap extends VMStatsDiskLRUReg
}
private static class VMStatsDiskLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VMStatsDiskLRURegionEntryOffHeap extends VMStatsDiskLRUReg
return new VMStatsDiskLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsDiskLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
index c193444..554268a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMStatsDiskRegionEntryHeap extends VMStatsDiskRegionEntry {
+
public VMStatsDiskRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMStatsDiskRegionEntryHeap extends VMStatsDiskRegionEntry
}
private static class VMStatsDiskRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsDiskRegionEntryHeap extends VMStatsDiskRegionEntry
return new VMStatsDiskRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsDiskRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
index 9ec129f..cfe8fef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMStatsDiskRegionEntryOffHeap extends VMStatsDiskRegionEntry
implements OffHeapRegionEntry {
+
public VMStatsDiskRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMStatsDiskRegionEntryOffHeap extends VMStatsDiskRegionEnt
}
private static class VMStatsDiskRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsDiskRegionEntryOffHeap extends VMStatsDiskRegionEnt
return new VMStatsDiskRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsDiskRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
index 16c1013..1d474fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMStatsLRURegionEntryHeap extends VMStatsLRURegionEntry {
+
public VMStatsLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMStatsLRURegionEntryHeap extends VMStatsLRURegionEntry {
}
private static class VMStatsLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMStatsLRURegionEntryHeap extends VMStatsLRURegionEntry {
return new VMStatsLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
index 52d7f6f..95487d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMStatsLRURegionEntryOffHeap extends VMStatsLRURegionEntry
implements OffHeapRegionEntry {
+
public VMStatsLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMStatsLRURegionEntryOffHeap extends VMStatsLRURegionEntry
}
private static class VMStatsLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsLRURegionEntryOffHeap extends VMStatsLRURegionEntry
return new VMStatsLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
index ce3641b..082b645 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMStatsRegionEntryHeap extends VMStatsRegionEntry {
+
public VMStatsRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -28,7 +29,7 @@ public abstract class VMStatsRegionEntryHeap extends VMStatsRegionEntry {
}
private static class VMStatsRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -53,7 +54,7 @@ public abstract class VMStatsRegionEntryHeap extends VMStatsRegionEntry {
return new VMStatsRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
index 1689a8f..03fd31d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMStatsRegionEntryOffHeap extends VMStatsRegionEntry
implements OffHeapRegionEntry {
+
public VMStatsRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMStatsRegionEntryOffHeap extends VMStatsRegionEntry
}
private static class VMStatsRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMStatsRegionEntryOffHeap extends VMStatsRegionEntry
return new VMStatsRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMStatsRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
index 24bd9f4..56d5414 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMThinDiskLRURegionEntryHeap extends VMThinDiskLRURegionEntry {
+
public VMThinDiskLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMThinDiskLRURegionEntryHeap extends VMThinDiskLRURegionEn
}
private static class VMThinDiskLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinDiskLRURegionEntryHeap extends VMThinDiskLRURegionEn
return new VMThinDiskLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinDiskLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
index 20a4127..c9d2eca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMThinDiskLRURegionEntryOffHeap extends VMThinDiskLRURegionEntry
implements OffHeapRegionEntry {
+
public VMThinDiskLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMThinDiskLRURegionEntryOffHeap extends VMThinDiskLRURegio
}
private static class VMThinDiskLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VMThinDiskLRURegionEntryOffHeap extends VMThinDiskLRURegio
return new VMThinDiskLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinDiskLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
index 27b5a5a..6018f50 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMThinDiskRegionEntryHeap extends VMThinDiskRegionEntry {
+
public VMThinDiskRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMThinDiskRegionEntryHeap extends VMThinDiskRegionEntry {
}
private static class VMThinDiskRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinDiskRegionEntryHeap extends VMThinDiskRegionEntry {
return new VMThinDiskRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinDiskRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
index e900c2c..60c1628 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMThinDiskRegionEntryOffHeap extends VMThinDiskRegionEntry
implements OffHeapRegionEntry {
+
public VMThinDiskRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMThinDiskRegionEntryOffHeap extends VMThinDiskRegionEntry
}
private static class VMThinDiskRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMThinDiskRegionEntryOffHeap extends VMThinDiskRegionEntry
return new VMThinDiskRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinDiskRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
index 44ba283..dacba73 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VMThinLRURegionEntryHeap extends VMThinLRURegionEntry {
+
public VMThinLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VMThinLRURegionEntryHeap extends VMThinLRURegionEntry {
}
private static class VMThinLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VMThinLRURegionEntryHeap extends VMThinLRURegionEntry {
return new VMThinLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
index 9ed657d..9e6a611 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VMThinLRURegionEntryOffHeap extends VMThinLRURegionEntry
implements OffHeapRegionEntry {
+
public VMThinLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VMThinLRURegionEntryOffHeap extends VMThinLRURegionEntry
}
private static class VMThinLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -55,7 +56,7 @@ public abstract class VMThinLRURegionEntryOffHeap extends VMThinLRURegionEntry
return new VMThinLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
index 3666a0a..d995852 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeap.java
@@ -29,7 +29,7 @@ public abstract class VMThinRegionEntryHeap extends VMThinRegionEntry {
}
private static class VMThinRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +54,7 @@ public abstract class VMThinRegionEntryHeap extends VMThinRegionEntry {
return new VMThinRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
index 6426df0..64c305e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeap.java
@@ -31,7 +31,7 @@ public abstract class VMThinRegionEntryOffHeap extends VMThinRegionEntry
}
private static class VMThinRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +56,7 @@ public abstract class VMThinRegionEntryOffHeap extends VMThinRegionEntry
return new VMThinRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VMThinRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
index 6c7bc91..1f7b878 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedStatsDiskLRURegionEntryHeap
extends VersionedStatsDiskLRURegionEntry {
+
public VersionedStatsDiskLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedStatsDiskLRURegionEntryHeap
}
private static class VersionedStatsDiskLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsDiskLRURegionEntryHeap
return new VersionedStatsDiskLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsDiskLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
index 8b38a2b..808a0e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedStatsDiskLRURegionEntryOffHeap
extends VersionedStatsDiskLRURegionEntry implements OffHeapRegionEntry {
+
public VersionedStatsDiskLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -31,7 +32,7 @@ public abstract class VersionedStatsDiskLRURegionEntryOffHeap
private static class VersionedStatsDiskLRURegionEntryOffHeapFactory
implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -58,7 +59,7 @@ public abstract class VersionedStatsDiskLRURegionEntryOffHeap
return new VersionedStatsDiskLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsDiskLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
index c6bdf93..3e440ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedStatsDiskRegionEntryHeap extends VersionedStatsDiskRegionEntry {
+
public VersionedStatsDiskRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedStatsDiskRegionEntryHeap extends VersionedStatsDi
}
private static class VersionedStatsDiskRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedStatsDiskRegionEntryHeap extends VersionedStatsDi
return new VersionedStatsDiskRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsDiskRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
index d2f1dcf..b5e0395 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedStatsDiskRegionEntryOffHeap extends VersionedStatsDiskRegionEntry
implements OffHeapRegionEntry {
+
public VersionedStatsDiskRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedStatsDiskRegionEntryOffHeap extends VersionedStat
}
private static class VersionedStatsDiskRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsDiskRegionEntryOffHeap extends VersionedStat
return new VersionedStatsDiskRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsDiskRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
index 6978d51..c698e63 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedStatsLRURegionEntryHeap extends VersionedStatsLRURegionEntry {
+
public VersionedStatsLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedStatsLRURegionEntryHeap extends VersionedStatsLRU
}
private static class VersionedStatsLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedStatsLRURegionEntryHeap extends VersionedStatsLRU
return new VersionedStatsLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
index f46bcbf..124d03a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedStatsLRURegionEntryOffHeap extends VersionedStatsLRURegionEntry
implements OffHeapRegionEntry {
+
public VersionedStatsLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedStatsLRURegionEntryOffHeap extends VersionedStats
}
private static class VersionedStatsLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsLRURegionEntryOffHeap extends VersionedStats
return new VersionedStatsLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
index 55dc5ef..bc33c35 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedStatsRegionEntryHeap extends VersionedStatsRegionEntry {
+
public VersionedStatsRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedStatsRegionEntryHeap extends VersionedStatsRegion
}
private static class VersionedStatsRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -54,7 +55,7 @@ public abstract class VersionedStatsRegionEntryHeap extends VersionedStatsRegion
return new VersionedStatsRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
index 2fe12c1..e272a5b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedStatsRegionEntryOffHeap extends VersionedStatsRegionEntry
implements OffHeapRegionEntry {
+
public VersionedStatsRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedStatsRegionEntryOffHeap extends VersionedStatsReg
}
private static class VersionedStatsRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedStatsRegionEntryOffHeap extends VersionedStatsReg
return new VersionedStatsRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedStatsRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
index 1eec3e9..af7c5cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedThinDiskLRURegionEntryHeap extends VersionedThinDiskLRURegionEntry {
+
public VersionedThinDiskLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedThinDiskLRURegionEntryHeap extends VersionedThinD
}
private static class VersionedThinDiskLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinDiskLRURegionEntryHeap extends VersionedThinD
return new VersionedThinDiskLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinDiskLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
index e82a0aa..746ddc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedThinDiskLRURegionEntryOffHeap extends VersionedThinDiskLRURegionEntry
implements OffHeapRegionEntry {
+
public VersionedThinDiskLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedThinDiskLRURegionEntryOffHeap extends VersionedTh
}
private static class VersionedThinDiskLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinDiskLRURegionEntryOffHeap extends VersionedTh
return new VersionedThinDiskLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinDiskLRURegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
index 42d8564..bfa0428 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedThinDiskRegionEntryHeap extends VersionedThinDiskRegionEntry {
+
public VersionedThinDiskRegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedThinDiskRegionEntryHeap extends VersionedThinDisk
}
private static class VersionedThinDiskRegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinDiskRegionEntryHeap extends VersionedThinDisk
return new VersionedThinDiskRegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinDiskRegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
index 4bdb7a4..3d47afe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedThinDiskRegionEntryOffHeap extends VersionedThinDiskRegionEntry
implements OffHeapRegionEntry {
+
public VersionedThinDiskRegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedThinDiskRegionEntryOffHeap extends VersionedThinD
}
private static class VersionedThinDiskRegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinDiskRegionEntryOffHeap extends VersionedThinD
return new VersionedThinDiskRegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinDiskRegionEntryOffHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
index fb260be..49e205b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeap.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache;
import java.util.UUID;
public abstract class VersionedThinLRURegionEntryHeap extends VersionedThinLRURegionEntry {
+
public VersionedThinLRURegionEntryHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -29,7 +30,7 @@ public abstract class VersionedThinLRURegionEntryHeap extends VersionedThinLRURe
}
private static class VersionedThinLRURegionEntryHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -56,7 +57,7 @@ public abstract class VersionedThinLRURegionEntryHeap extends VersionedThinLRURe
return new VersionedThinLRURegionEntryHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinLRURegionEntryHeapObjectKey.class;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
index 1286bb6..0aa2c5f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeap.java
@@ -18,6 +18,7 @@ import java.util.UUID;
public abstract class VersionedThinLRURegionEntryOffHeap extends VersionedThinLRURegionEntry
implements OffHeapRegionEntry {
+
public VersionedThinLRURegionEntryOffHeap(RegionEntryContext context, Object value) {
super(context, value);
}
@@ -30,7 +31,7 @@ public abstract class VersionedThinLRURegionEntryOffHeap extends VersionedThinLR
}
private static class VersionedThinLRURegionEntryOffHeapFactory implements RegionEntryFactory {
- public final RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext context, Object key, Object value) {
if (InlineKeyHelper.INLINE_REGION_KEYS) {
Class<?> keyClass = key.getClass();
if (keyClass == Integer.class) {
@@ -57,7 +58,7 @@ public abstract class VersionedThinLRURegionEntryOffHeap extends VersionedThinLR
return new VersionedThinLRURegionEntryOffHeapObjectKey(context, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
// The class returned from this method is used to estimate the memory size.
// This estimate will not take into account the memory saved by inlining the keys.
return VersionedThinLRURegionEntryOffHeapObjectKey.class;
[21/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
index 6915625..f8f0e34 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,6 +91,7 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -92,13 +122,19 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -114,7 +150,9 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -138,7 +176,7 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -149,19 +187,22 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -178,7 +219,7 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -186,7 +227,9 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -211,7 +254,6 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -251,110 +293,116 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -365,5 +413,8 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
index 86277c7..8899faa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -15,45 +15,73 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,6 +90,7 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +122,19 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +150,9 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +176,7 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,19 +187,22 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -179,7 +219,7 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -187,7 +227,9 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -212,7 +254,6 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -252,111 +293,120 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
index 9048454..7712cee 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -15,41 +15,66 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -68,9 +93,11 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -79,6 +106,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -110,13 +138,19 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -132,7 +166,9 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -156,7 +192,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -167,19 +203,22 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -196,7 +235,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -204,7 +243,9 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -229,7 +270,6 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -269,106 +309,112 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -382,7 +428,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -401,6 +447,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -430,5 +477,8 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
index a90d9bf..9a29a32 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -15,41 +15,66 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -80,9 +105,11 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -91,6 +118,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -122,13 +150,19 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -144,7 +178,9 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -168,7 +204,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -179,19 +215,22 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -208,7 +247,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -216,7 +255,9 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -241,7 +282,6 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -281,106 +321,112 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -399,7 +445,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -429,6 +475,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -471,5 +518,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
index e4b0365..2fbe939 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -15,47 +15,77 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -64,6 +94,7 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -94,13 +125,19 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -116,7 +153,9 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -140,7 +179,7 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -151,19 +190,22 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -180,7 +222,7 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -188,7 +230,9 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -213,7 +257,6 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -253,111 +296,117 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -370,5 +419,8 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
index 9233157..99e1b9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
@@ -15,37 +15,64 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -53,10 +80,11 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -76,7 +104,7 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -87,19 +115,22 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -109,7 +140,9 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -134,7 +167,6 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -174,12 +206,19 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -190,5 +229,8 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
index 6515ddb..a00b4b6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
@@ -15,13 +15,19 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
@@ -29,23 +35,44 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -53,10 +80,11 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -76,7 +104,7 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -87,19 +115,22 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -109,7 +140,9 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -134,7 +167,6 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -174,12 +206,17 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -190,5 +227,8 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
index e60c2f1..d890d18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
@@ -15,37 +15,63 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -53,10 +79,11 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -76,7 +103,7 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -87,19 +114,22 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -109,7 +139,9 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -134,7 +166,6 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -174,13 +205,21 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
index b2012ad..62ae556 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
@@ -15,13 +15,19 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
@@ -31,18 +37,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -61,9 +83,11 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -71,10 +95,11 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -94,7 +119,7 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -105,19 +130,22 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -127,7 +155,9 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -152,7 +182,6 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -192,8 +221,13 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -207,7 +241,7 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -226,6 +260,7 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -255,5 +290,8 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
index 72206c7..2acfe8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
@@ -15,13 +15,19 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
@@ -32,17 +38,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -73,9 +95,11 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -83,10 +107,11 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -106,7 +131,7 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -117,19 +142,22 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -139,7 +167,9 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -164,7 +194,6 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -204,8 +233,13 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -224,7 +258,7 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -254,6 +288,7 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -296,5 +331,7 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
index b4cab22..dd3dce2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
@@ -15,14 +15,21 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
@@ -31,23 +38,44 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap {
- public VMThinDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +83,11 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +107,7 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,19 +118,22 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -111,7 +143,9 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -136,7 +170,6 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -176,13 +209,18 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -195,5 +233,8 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[65/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
GEODE-2929: remove superfluous final from methods
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/97a6e1ae
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/97a6e1ae
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/97a6e1ae
Branch: refs/heads/feature/GEODE-2580
Commit: 97a6e1ae58504ee04f22a4cafa93d6ea32b215e2
Parents: 8863195
Author: Kirk Lund <kl...@apache.org>
Authored: Fri May 19 14:23:17 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri May 19 14:54:35 2017 -0700
----------------------------------------------------------------------
.../internal/web/RestInterfaceJUnitTest.java | 2 +-
.../java/org/apache/geode/CancelCriterion.java | 4 +-
.../org/apache/geode/CanonicalInstantiator.java | 6 +-
.../java/org/apache/geode/DataSerializer.java | 30 ++---
.../java/org/apache/geode/Instantiator.java | 20 +---
.../geode/admin/RegionSubRegionSnapshot.java | 16 +--
.../apache/geode/cache/DiskAccessException.java | 4 +-
.../geode/cache/DynamicRegionFactory.java | 3 +-
.../org/apache/geode/cache/EvictionAction.java | 10 +-
.../apache/geode/cache/EvictionAlgorithm.java | 16 +--
.../apache/geode/cache/EvictionAttributes.java | 4 +-
.../geode/cache/FixedPartitionAttributes.java | 10 +-
.../geode/cache/MembershipAttributes.java | 16 ++-
.../geode/cache/client/internal/AbstractOp.java | 2 +-
.../geode/cache/execute/FunctionException.java | 10 +-
.../cache/query/internal/ObjectIntHashMap.java | 13 +--
.../geode/compression/SnappyCompressor.java | 2 +-
.../geode/distributed/AbstractLauncher.java | 2 +-
.../geode/distributed/LocatorLauncher.java | 6 +-
.../geode/distributed/ServerLauncher.java | 12 +-
.../internal/DistributionAdvisor.java | 15 ++-
.../internal/DistributionManager.java | 52 +++++++--
.../internal/DistributionMessage.java | 6 +-
.../distributed/internal/ReplyProcessor21.java | 14 ++-
.../apache/geode/internal/AbstractConfig.java | 3 +-
.../geode/internal/HeapDataOutputStream.java | 26 +++--
.../geode/internal/ObjIdConcurrentMap.java | 27 ++---
.../apache/geode/internal/SharedLibrary.java | 2 +-
.../org/apache/geode/internal/SystemTimer.java | 2 +-
.../internal/cache/AbstractDiskRegion.java | 35 +++---
.../internal/cache/AbstractLRURegionMap.java | 9 +-
.../cache/AbstractOplogDiskRegionEntry.java | 2 +-
.../geode/internal/cache/AbstractRegion.java | 4 +-
.../geode/internal/cache/AbstractRegionMap.java | 2 +-
.../geode/internal/cache/BucketAdvisor.java | 5 +-
.../geode/internal/cache/DestroyOperation.java | 9 +-
.../internal/cache/DistPeerTXStateStub.java | 5 +-
.../cache/DistributedCacheOperation.java | 8 +-
.../cache/DistributedPutAllOperation.java | 3 +-
.../geode/internal/cache/DistributedRegion.java | 2 +-
...stributedRegionFunctionStreamingMessage.java | 4 +-
.../cache/DistributedRemoveAllOperation.java | 12 +-
.../apache/geode/internal/cache/ExpiryTask.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 2 +-
.../geode/internal/cache/GridAdvisor.java | 14 +--
.../internal/cache/InitialImageOperation.java | 6 +-
.../cache/MemberFunctionStreamingMessage.java | 2 +-
.../internal/cache/NonLocalRegionEntry.java | 8 +-
.../cache/PartitionedRegionDataStore.java | 57 +--------
.../internal/cache/PlaceHolderDiskRegion.java | 4 +-
.../geode/internal/cache/ProxyBucketRegion.java | 2 +-
.../internal/cache/RemoteFetchEntryMessage.java | 8 +-
.../internal/cache/RemotePutAllMessage.java | 3 +-
.../internal/cache/RemoteRemoveAllMessage.java | 2 +-
.../internal/cache/StateFlushOperation.java | 2 +-
.../apache/geode/internal/cache/TXEvent.java | 7 +-
.../org/apache/geode/internal/cache/TXId.java | 8 +-
.../apache/geode/internal/cache/TXMessage.java | 2 +-
.../apache/geode/internal/cache/TXState.java | 14 ---
.../geode/internal/cache/TXStateStub.java | 16 +--
.../cache/VMStatsDiskLRURegionEntryHeap.java | 5 +-
.../cache/VMStatsDiskLRURegionEntryOffHeap.java | 5 +-
.../cache/VMStatsDiskRegionEntryHeap.java | 5 +-
.../cache/VMStatsDiskRegionEntryOffHeap.java | 5 +-
.../cache/VMStatsLRURegionEntryHeap.java | 5 +-
.../cache/VMStatsLRURegionEntryOffHeap.java | 5 +-
.../internal/cache/VMStatsRegionEntryHeap.java | 5 +-
.../cache/VMStatsRegionEntryOffHeap.java | 5 +-
.../cache/VMThinDiskLRURegionEntryHeap.java | 5 +-
.../cache/VMThinDiskLRURegionEntryOffHeap.java | 5 +-
.../cache/VMThinDiskRegionEntryHeap.java | 5 +-
.../cache/VMThinDiskRegionEntryOffHeap.java | 5 +-
.../cache/VMThinLRURegionEntryHeap.java | 5 +-
.../cache/VMThinLRURegionEntryOffHeap.java | 5 +-
.../internal/cache/VMThinRegionEntryHeap.java | 4 +-
.../cache/VMThinRegionEntryOffHeap.java | 4 +-
.../VersionedStatsDiskLRURegionEntryHeap.java | 5 +-
...VersionedStatsDiskLRURegionEntryOffHeap.java | 5 +-
.../VersionedStatsDiskRegionEntryHeap.java | 5 +-
.../VersionedStatsDiskRegionEntryOffHeap.java | 5 +-
.../cache/VersionedStatsLRURegionEntryHeap.java | 5 +-
.../VersionedStatsLRURegionEntryOffHeap.java | 5 +-
.../cache/VersionedStatsRegionEntryHeap.java | 5 +-
.../cache/VersionedStatsRegionEntryOffHeap.java | 5 +-
.../VersionedThinDiskLRURegionEntryHeap.java | 5 +-
.../VersionedThinDiskLRURegionEntryOffHeap.java | 5 +-
.../cache/VersionedThinDiskRegionEntryHeap.java | 5 +-
.../VersionedThinDiskRegionEntryOffHeap.java | 5 +-
.../cache/VersionedThinLRURegionEntryHeap.java | 5 +-
.../VersionedThinLRURegionEntryOffHeap.java | 5 +-
.../cache/VersionedThinRegionEntryHeap.java | 5 +-
.../cache/VersionedThinRegionEntryOffHeap.java | 5 +-
.../internal/cache/control/ResourceAdvisor.java | 2 +-
.../internal/cache/locks/TXLockIdImpl.java | 6 +-
.../geode/internal/cache/lru/LRUAlgorithm.java | 42 ++-----
.../cache/partitioned/BucketBackupMessage.java | 4 +-
.../partitioned/DeposePrimaryBucketMessage.java | 4 +-
.../cache/partitioned/FetchEntryMessage.java | 18 +--
.../FetchPartitionDetailsMessage.java | 4 +-
.../cache/partitioned/MoveBucketMessage.java | 5 +-
.../cache/partitioned/PartitionMessage.java | 14 +--
.../cache/partitioned/RemoveAllPRMessage.java | 4 +-
.../cache/partitioned/RemoveBucketMessage.java | 6 +-
.../internal/cache/partitioned/SizeMessage.java | 8 +-
.../cache/tier/sockets/CacheClientUpdater.java | 4 +-
.../geode/internal/cache/tier/sockets/Part.java | 20 +---
.../parallel/ParallelGatewaySenderQueue.java | 22 ----
.../cache/wan/serial/BatchDestroyOperation.java | 10 +-
.../CacheTransactionManagerCreation.java | 10 +-
.../cache/xmlcache/CacheXmlVersion.java | 7 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 9 +-
.../internal/statistics/StatArchiveWriter.java | 4 +-
.../apache/geode/internal/tcp/Connection.java | 117 +++++++++----------
.../management/internal/IdentityConverter.java | 5 +-
.../management/internal/OpenTypeConverter.java | 63 ++--------
.../management/internal/cli/json/TypedJson.java | 19 +--
.../management/internal/web/domain/Link.java | 6 +-
.../internal/web/http/ClientHttpRequest.java | 2 +-
.../internal/executor/AbstractScanExecutor.java | 6 +-
.../org/apache/geode/DataSerializerTest.java | 50 ++++++++
.../java/org/apache/geode/InstantiatorTest.java | 53 +++++++++
.../admin/RegionSubRegionSnapshotTest.java | 58 +++++++++
.../cache/ConnectionPoolFactoryJUnitTest.java | 2 +-
.../geode/cache/DiskAccessExceptionTest.java | 34 ++++++
.../cache/client/internal/AbstractOpTest.java | 39 +++++++
.../cache/execute/FunctionExceptionTest.java | 51 ++++++++
.../query/functional/PdxOrderByJUnitTest.java | 6 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 2 +-
.../cache30/CacheSerializableRunnable.java | 4 +-
.../apache/geode/cache30/RegionTestCase.java | 4 +-
.../geode/cache30/TXDistributedDUnitTest.java | 2 +-
.../apache/geode/cache30/TestCacheCallback.java | 2 +-
.../apache/geode/cache30/TestCacheListener.java | 12 +-
.../apache/geode/cache30/TestCacheLoader.java | 2 +-
.../apache/geode/cache30/TestCacheWriter.java | 19 ++-
.../geode/cache30/TestTransactionListener.java | 6 +-
.../geode/distributed/AbstractLauncherTest.java | 10 ++
...ocatorLauncherRemoteIntegrationTestCase.java | 2 +-
...ServerLauncherRemoteIntegrationTestCase.java | 2 +-
.../geode/distributed/LocatorLauncherTest.java | 19 ++-
.../geode/distributed/ServerLauncherTest.java | 30 +++++
.../internal/DistributionAdvisorTest.java | 34 ++++++
.../internal/DistributionManagerTest.java | 43 +++++++
.../internal/DistributionMessageTest.java | 37 ++++++
.../internal/ReplyProcessor21Test.java | 38 ++++++
.../geode/internal/AbstractConfigTest.java | 34 ++++++
.../internal/DataSerializableJUnitTest.java | 4 +-
.../internal/HeapDataOutputStreamTest.java | 35 ++++++
.../geode/internal/ObjIdConcurrentMapTest.java | 39 +++++++
.../internal/cache/AbstractDiskRegionTest.java | 42 +++++++
.../cache/AbstractLRURegionMapTest.java | 44 +++++++
.../cache/AbstractOplogDiskRegionEntryTest.java | 38 ++++++
.../internal/cache/AbstractRegionMapTest.java | 35 +++++-
.../internal/cache/AbstractRegionTest.java | 39 +++++++
.../geode/internal/cache/BucketAdvisorTest.java | 40 +++++++
.../geode/internal/cache/Bug37377DUnitTest.java | 4 +-
.../geode/internal/cache/Bug39079DUnitTest.java | 4 +-
.../cache/CacheOperationMessageTest.java | 50 ++++++++
.../internal/cache/DestroyMessageTest.java | 42 +++++++
.../cache/DiskRegCacheXmlJUnitTest.java | 2 +-
.../cache/DiskRegionClearJUnitTest.java | 2 +-
.../internal/cache/DiskRegionTestingBase.java | 2 +-
.../internal/cache/DistPeerTXStateStubTest.java | 44 +++++++
.../cache/DistributedCacheOperationTest.java | 50 ++++++++
.../cache/DistributedPutAllOperationTest.java | 38 ++++++
...butedRegionFunctionStreamingMessageTest.java | 44 +++++++
.../internal/cache/DistributedRegionTest.java | 42 +++++++
.../DistributedRemoveAllOperationTest.java | 38 ++++++
.../geode/internal/cache/ExpiryTaskTest.java | 34 ++++++
.../internal/cache/GemFireCacheImplTest.java | 13 +++
.../geode/internal/cache/GridProfileTest.java | 61 ++++++++++
.../MemberFunctionStreamingMessageTest.java | 39 +++++++
.../internal/cache/NonLocalRegionEntryTest.java | 45 +++++++
...gionBucketCreationDistributionDUnitTest.java | 4 +-
.../cache/PlaceHolderDiskRegionTest.java | 34 ++++++
.../internal/cache/ProxyBucketRegionTest.java | 37 ++++++
.../cache/RemoteFetchEntryMessageTest.java | 43 +++++++
.../internal/cache/RemotePutAllMessageTest.java | 39 +++++++
.../cache/RemoteRemoveAllMessageTest.java | 39 +++++++
.../cache/RequestFilterInfoMessageTest.java | 35 ++++++
.../internal/cache/RequestImageMessageTest.java | 35 ++++++
.../internal/cache/RequestRVVMessageTest.java | 35 ++++++
.../internal/cache/StateMarkerMessageTest.java | 35 ++++++
.../geode/internal/cache/TXEventTest.java | 36 ++++++
.../geode/internal/cache/TXMessageTest.java | 36 ++++++
.../geode/internal/cache/TXStateStubTest.java | 38 ++++++
.../apache/geode/internal/cache/UnzipUtil.java | 4 +-
.../cache/control/ResourceAdvisorTest.java | 37 ++++++
.../internal/cache/ha/ConflatableObject.java | 20 ++--
.../internal/cache/lru/LRUAlgorithmTest.java | 34 ++++++
.../partitioned/BucketBackupMessageTest.java | 34 ++++++
.../ColocatedRegionDetailsJUnitTest.java | 73 ++++--------
.../DeposePrimaryBucketMessageTest.java | 42 +++++++
.../partitioned/FetchEntryMessageTest.java | 48 ++++++++
.../FetchPartitionDetailsMessageTest.java | 45 +++++++
.../partitioned/MoveBucketMessageTest.java | 44 +++++++
.../cache/partitioned/PartitionMessageTest.java | 31 +++--
.../partitioned/RemoveAllPRMessageTest.java | 37 ++++++
.../partitioned/RemoveBucketMessageTest.java | 44 +++++++
.../cache/partitioned/SizeMessageTest.java | 33 ++++++
.../cache/tier/sockets/CCUStatsTest.java | 39 +++++++
.../internal/cache/tier/sockets/PartTest.java | 41 +++++++
.../versions/RegionVersionHolderJUnitTest.java | 2 +-
.../cache/versions/TombstoneDUnitTest.java | 2 +-
.../cache/wan/AsyncEventQueueTestBase.java | 2 +-
.../AsyncEventQueueValidationsJUnitTest.java | 2 +-
.../cache/wan/serial/DestroyMessageTest.java | 43 +++++++
.../CacheTransactionManagerCreationTest.java | 47 ++++++++
.../xmlcache/DefaultEntityResolver2Test.java | 40 +++++++
.../internal/jta/functional/CacheJUnitTest.java | 2 +-
.../jta/functional/TestXACacheLoader.java | 2 +-
.../internal/logging/LogServiceJUnitTest.java | 2 +-
.../logging/log4j/AlertAppenderJUnitTest.java | 4 +-
.../log4j/LogWriterAppenderJUnitTest.java | 6 +-
.../statistics/StatArchiveWriterTest.java | 39 +++++++
.../geode/internal/tcp/ConnectionTest.java | 45 +++++++
.../internal/CompositeBuilderViaFromTest.java | 45 +++++++
.../internal/CompositeBuilderViaProxyTest.java | 45 +++++++
.../internal/IdentityConverterTest.java | 36 ++++++
.../cli/commands/CliCommandTestBase.java | 4 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 2 +-
.../cli/functions/ExportedLogsSizeInfoTest.java | 18 +--
.../ShowMissingDiskStoresFunctionJUnitTest.java | 82 +++----------
.../internal/cli/json/TypedJsonTest.java | 38 ++++++
.../WanCommandsControllerJUnitTest.java | 2 +-
.../internal/web/domain/LinkTest.java | 45 +++++++
.../web/http/ClientHttpRequestTest.java | 37 ++++++
.../geode/pdx/PdxSerializableDUnitTest.java | 2 +-
.../executor/AbstractScanExecutorTest.java | 39 +++++++
.../security/ClientAuthorizationTestCase.java | 4 +-
.../DeltaClientAuthorizationDUnitTest.java | 2 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 2 +-
.../generator/AuthzCredentialGenerator.java | 8 +-
.../security/generator/CredentialGenerator.java | 8 +-
.../org/apache/geode/test/dunit/DUnitEnv.java | 2 +-
.../geode/test/dunit/DistributedTestUtils.java | 2 +-
.../java/org/apache/geode/test/dunit/Wait.java | 6 +-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 2 +-
.../geode/test/golden/FailOutputTestCase.java | 3 +-
.../apache/geode/test/golden/PassJUnitTest.java | 2 +-
.../golden/PassWithExpectedProblemTestCase.java | 2 +-
.../internal/cache/ha/CQListGIIDUnitTest.java | 2 +-
.../geode/cache/lucene/LuceneDUnitTest.java | 2 +-
.../lucene/LuceneIndexCreationDUnitTest.java | 8 +-
...IndexCreationPersistenceIntegrationTest.java | 3 +-
.../lucene/LuceneIndexDestroyDUnitTest.java | 2 +-
.../LuceneIndexCreationProfileJUnitTest.java | 4 +-
.../cache/execute/FunctionException.java | 12 +-
.../cache/execute/FunctionExceptionTest.java | 48 ++++++++
.../geode/internal/cache/wan/WANTestBase.java | 2 +-
.../web/controllers/support/RegionData.java | 47 ++------
.../web/controllers/support/RegionDataTest.java | 35 ++++++
252 files changed, 3523 insertions(+), 1008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 324284e..7cdc104 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -403,7 +403,7 @@ public class RestInterfaceJUnitTest {
this.lastName = lastName;
}
- protected final String format(final Date dateTime) {
+ protected String format(final Date dateTime) {
return format(dateTime, DEFAULT_BIRTH_DATE_FORMAT_PATTERN);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
index fec3827..704da8e 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
@@ -58,7 +58,7 @@ public abstract class CancelCriterion {
*
* @return failure string if system failure has occurred
*/
- protected final String checkFailure() {
+ protected String checkFailure() {
Throwable tilt = SystemFailure.getFailure();
if (tilt != null) {
// Allocate no objects here!
@@ -74,7 +74,7 @@ public abstract class CancelCriterion {
* @param e an underlying exception or null if there is no exception that triggered this check
* @see #cancelInProgress()
*/
- public final void checkCancelInProgress(Throwable e) {
+ public void checkCancelInProgress(Throwable e) {
SystemFailure.checkFailure();
String reason = cancelInProgress();
if (reason == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
index 10e6f16..af34363 100644
--- a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode;
-import java.io.*;
+import java.io.DataInput;
+import java.io.IOException;
/**
* <code>CanonicalInstantiator</code> is much like its parent <code>Instantiator</code> except that
@@ -31,6 +32,7 @@ import java.io.*;
* @since GemFire 5.1
*/
public abstract class CanonicalInstantiator extends Instantiator {
+
/**
* Creates a new <code>CanonicalInstantiator</code> that instantiates a given class.
*
@@ -54,7 +56,7 @@ public abstract class CanonicalInstantiator extends Instantiator {
* @throws UnsupportedOperationException in all cases
*/
@Override
- public final DataSerializable newInstance() {
+ public DataSerializable newInstance() {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/DataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 34501f8..2d16459 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -193,10 +193,6 @@ public abstract class DataSerializer {
protected static final ThreadLocal<Boolean> DISALLOW_JAVA_SERIALIZATION =
new ThreadLocal<Boolean>();
- ////////////////////// Instance Fields /////////////////////
-
- ////////////////////// Static Methods //////////////////////
-
/**
* Writes an instance of <code>Class</code> to a <code>DataOutput</code>. This method will handle
* a <code>null</code> value and not throw a <code>NullPointerException</code>.
@@ -322,7 +318,6 @@ public abstract class DataSerializer {
return rgn;
}
-
/**
* Writes an instance of <code>Date</code> to a <code>DataOutput</code>. Note that even though
* <code>date</code> may be an instance of a subclass of <code>Date</code>, <code>readDate</code>
@@ -509,7 +504,7 @@ public abstract class DataSerializer {
out.writeByte(DSCODE.NULL_STRING);
} else {
- // [bruce] writeUTF is expensive - it creates a char[] to fetch
+ // writeUTF is expensive - it creates a char[] to fetch
// the string's contents, iterates over the array to compute the
// encoded length, creates a byte[] to hold the encoded bytes,
// iterates over the char[] again to create the encode bytes,
@@ -2903,7 +2898,7 @@ public abstract class DataSerializer {
* @see Instantiator
* @see ObjectOutputStream#writeObject
*/
- public static final void writeObject(Object o, DataOutput out, boolean allowJavaSerialization)
+ public static void writeObject(Object o, DataOutput out, boolean allowJavaSerialization)
throws IOException {
if (allowJavaSerialization) {
@@ -2937,7 +2932,7 @@ public abstract class DataSerializer {
* @see DataSerializer
* @see ObjectOutputStream#writeObject
*/
- public static final void writeObject(Object o, DataOutput out) throws IOException {
+ public static void writeObject(Object o, DataOutput out) throws IOException {
InternalDataSerializer.basicWriteObject(o, out, false);
}
@@ -2962,8 +2957,7 @@ public abstract class DataSerializer {
* @see ObjectInputStream#readObject
*/
@SuppressWarnings("unchecked")
- public static final <T> T readObject(final DataInput in)
- throws IOException, ClassNotFoundException {
+ public static <T> T readObject(final DataInput in) throws IOException, ClassNotFoundException {
return (T) InternalDataSerializer.basicReadObject(in);
}
@@ -2997,12 +2991,10 @@ public abstract class DataSerializer {
* the classes reserved by DataSerializer (see {@link #getSupportedClasses} for a list).
* @see #getSupportedClasses
*/
- public static final DataSerializer register(Class<?> c) {
+ public static DataSerializer register(Class<?> c) {
return InternalDataSerializer.register(c, true);
}
- /////////////////////// Constructors ///////////////////////
-
/**
* Creates a new <code>DataSerializer</code>. All class that implement <code>DataSerializer</code>
* must provide a zero-argument constructor.
@@ -3010,11 +3002,9 @@ public abstract class DataSerializer {
* @see #register(Class)
*/
public DataSerializer() {
-
+ // nothing
}
- ///////////////////// Instance Methods /////////////////////
-
/**
* Returns the <code>Class</code>es whose instances are data serialized by this
* <code>DataSerializer</code>. This method is invoked when this serializer is
@@ -3111,7 +3101,7 @@ public abstract class DataSerializer {
*
* @since GemFire 6.5
*/
- public final void setEventId(Object/* EventID */ eventId) {
+ public void setEventId(Object/* EventID */ eventId) {
this.eventId = (EventID) eventId;
}
@@ -3121,7 +3111,7 @@ public abstract class DataSerializer {
*
* @since GemFire 6.5
*/
- public final Object/* EventID */ getEventId() {
+ public Object/* EventID */ getEventId() {
return this.eventId;
}
@@ -3130,7 +3120,7 @@ public abstract class DataSerializer {
*
* @since GemFire 6.5
*/
- public final void setContext(Object/* ClientProxyMembershipID */ context) {
+ public void setContext(Object/* ClientProxyMembershipID */ context) {
this.context = (ClientProxyMembershipID) context;
}
@@ -3139,7 +3129,7 @@ public abstract class DataSerializer {
*
* @since GemFire 6.5
*/
- public final Object/* ClientProxyMembershipID */ getContext() {
+ public Object/* ClientProxyMembershipID */ getContext() {
return this.context;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/Instantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java
index e4da556..3c1ca06 100644
--- a/geode-core/src/main/java/org/apache/geode/Instantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java
@@ -142,9 +142,6 @@ public abstract class Instantiator {
/** The originator of this <code>Instantiator</code> */
private ClientProxyMembershipID context;
-
- /////////////////////// Static Methods ///////////////////////
-
/**
* Registers a <code>DataSerializable</code> class with the data serialization framework. This
* method is usually invoked from the static initializer of a class that implements
@@ -182,8 +179,6 @@ public abstract class Instantiator {
InternalInstantiator.register(instantiator, distribute);
}
- //////////////////////// Constructors ////////////////////////
-
/**
* Creates a new <code>Instantiator</code> that instantiates a given class.
*
@@ -217,8 +212,6 @@ public abstract class Instantiator {
this.id = classId;
}
- ////////////////////// Instance Methods //////////////////////
-
/**
* Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be
* filled in by invoking its {@link DataSerializable#fromData fromData} method.
@@ -231,21 +224,21 @@ public abstract class Instantiator {
* Returns the <code>DataSerializable</code> class that is instantiated by this
* <code>Instantiator</code>.
*/
- public final Class<? extends DataSerializable> getInstantiatedClass() {
+ public Class<? extends DataSerializable> getInstantiatedClass() {
return this.clazz;
}
/**
* Returns the unique <code>id</code> of this <code>Instantiator</code>.
*/
- public final int getId() {
+ public int getId() {
return this.id;
}
/**
* sets the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use only.
*/
- public final void setEventId(Object/* EventID */ eventId) {
+ public void setEventId(Object/* EventID */ eventId) {
this.eventId = (EventID) eventId;
}
@@ -253,23 +246,22 @@ public abstract class Instantiator {
* Returns the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use
* only.
*/
- public final Object/* EventID */ getEventId() {
+ public Object/* EventID */ getEventId() {
return this.eventId;
}
/**
* sets the context of this <code>Instantiator</code>. For internal use only.
*/
- public final void setContext(Object/* ClientProxyMembershipID */ context) {
+ public void setContext(Object/* ClientProxyMembershipID */ context) {
this.context = (ClientProxyMembershipID) context;
}
/**
* Returns the context of this <code>Instantiator</code>. For internal use only.
*/
- public final Object/* ClientProxyMembershipID */ getContext() {
+ public Object/* ClientProxyMembershipID */ getContext() {
return this.context;
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
index 19f89b2..69774b8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
@@ -83,56 +83,56 @@ public class RegionSubRegionSnapshot implements DataSerializable {
/**
* @return get entry count of region
*/
- public final int getEntryCount() {
+ public int getEntryCount() {
return entryCount;
}
/**
* @param entryCount entry count of region
*/
- public final void setEntryCount(int entryCount) {
+ public void setEntryCount(int entryCount) {
this.entryCount = entryCount;
}
/**
* @return name of region
*/
- public final String getName() {
+ public String getName() {
return name;
}
/**
* @param name name of region
*/
- public final void setName(String name) {
+ public void setName(String name) {
this.name = name;
}
/**
* @return subRegionSnapshots of all the sub regions
*/
- public final Set getSubRegionSnapshots() {
+ public Set getSubRegionSnapshots() {
return subRegionSnapshots;
}
/**
* @param subRegionSnapshots subRegionSnapshots of all the sub regions
*/
- public final void setSubRegionSnapshots(Set subRegionSnapshots) {
+ public void setSubRegionSnapshots(Set subRegionSnapshots) {
this.subRegionSnapshots = subRegionSnapshots;
}
/**
* @return snapshot of parent region
*/
- public final RegionSubRegionSnapshot getParent() {
+ public RegionSubRegionSnapshot getParent() {
return parent;
}
/**
* @param parent snapshot of parent region
*/
- public final void setParent(RegionSubRegionSnapshot parent) {
+ public void setParent(RegionSubRegionSnapshot parent) {
this.parent = parent;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
index e77e485..fb640cd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
@@ -19,8 +19,6 @@ import java.io.IOException;
/**
* Indicates that an <code>IOException</code> during a disk region operation.
*
- *
- *
* @since GemFire 3.2
*/
public class DiskAccessException extends CacheRuntimeException {
@@ -114,7 +112,7 @@ public class DiskAccessException extends CacheRuntimeException {
/**
* Returns true if this exception originated from a remote node.
*/
- public final boolean isRemote() {
+ public boolean isRemote() {
return this.isRemote;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index 9bf14cd..e9e64e7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.client.internal.ServerRegionProxy;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.DynamicRegionAttributes;
@@ -995,7 +994,7 @@ public abstract class DynamicRegionFactory {
// while internal, its contents should be communicated with bridge clients
@Override
- final public boolean shouldNotifyBridgeClients() {
+ public boolean shouldNotifyBridgeClients() {
return getCache().getCacheServers().size() > 0;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
index a8513d9..0fd1b27 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAction.java
@@ -55,7 +55,7 @@ public final class EvictionAction extends EnumSyntax {
private static final String[] stringTable = {"none", "local-destroy", "overflow-to-disk",};
@Override
- final protected String[] getStringTable() {
+ protected String[] getStringTable() {
return stringTable;
}
@@ -64,19 +64,19 @@ public final class EvictionAction extends EnumSyntax {
{NONE, LOCAL_DESTROY, OVERFLOW_TO_DISK};
@Override
- final protected EnumSyntax[] getEnumValueTable() {
+ protected EnumSyntax[] getEnumValueTable() {
return enumValueTable;
}
- public final boolean isLocalDestroy() {
+ public boolean isLocalDestroy() {
return this == LOCAL_DESTROY;
}
- public final boolean isOverflowToDisk() {
+ public boolean isOverflowToDisk() {
return this == OVERFLOW_TO_DISK;
}
- public final boolean isNone() {
+ public boolean isNone() {
return this == NONE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
index 96b55b6..f57f257 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAlgorithm.java
@@ -25,6 +25,7 @@ import javax.print.attribute.EnumSyntax;
*/
public final class EvictionAlgorithm extends EnumSyntax {
private static final long serialVersionUID = 5778669432033106789L;
+
/**
* The canonical EvictionAction that represents no eviction action
*/
@@ -71,16 +72,15 @@ public final class EvictionAlgorithm extends EnumSyntax {
"lru-memory-size", "lifo-entry-count", "lifo-memory-size"};
@Override
- final protected String[] getStringTable() {
+ protected String[] getStringTable() {
return stringTable;
}
- // TODO post Java 1.8.0u45 uncomment final flag, see JDK-8076152
- private static /* final */ EvictionAlgorithm[] enumValueTable =
+ private static final EvictionAlgorithm[] enumValueTable =
{NONE, LRU_ENTRY, LRU_HEAP, LRU_MEMORY, LIFO_ENTRY, LIFO_MEMORY,};
@Override
- final protected EnumSyntax[] getEnumValueTable() {
+ protected EnumSyntax[] getEnumValueTable() {
return enumValueTable;
}
@@ -111,15 +111,15 @@ public final class EvictionAlgorithm extends EnumSyntax {
return null;
}
- public final boolean isLRUEntry() {
+ public boolean isLRUEntry() {
return this == LRU_ENTRY;
}
- public final boolean isLRUMemory() {
+ public boolean isLRUMemory() {
return this == LRU_MEMORY;
}
- public final boolean isLRUHeap() {
+ public boolean isLRUHeap() {
return this == LRU_HEAP;
}
@@ -128,7 +128,7 @@ public final class EvictionAlgorithm extends EnumSyntax {
return this.isLRUEntry() || this.isLRUMemory() || this.isLRUHeap();
}
- public final boolean isNone() {
+ public boolean isNone() {
return this == NONE;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
index 8c30b30..cdd8aeb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EvictionAttributes.java
@@ -435,7 +435,7 @@ public abstract class EvictionAttributes implements DataSerializable {
public abstract EvictionAction getAction();
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
@@ -455,7 +455,7 @@ public abstract class EvictionAttributes implements DataSerializable {
}
@Override
- public final int hashCode() {
+ public int hashCode() {
if (getAlgorithm().isLRUHeap()) {
return getAlgorithm().hashCode();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
index dd8bd94..b257bfa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/FixedPartitionAttributes.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
*
* @since GemFire 6.6
*/
-
public abstract class FixedPartitionAttributes {
private final static boolean DEFAULT_PRIMARY_STATUS = false;
@@ -44,7 +43,7 @@ public abstract class FixedPartitionAttributes {
*
* @param name Name of the fixed partition.
*/
- final public static FixedPartitionAttributes createFixedPartition(String name) {
+ public static FixedPartitionAttributes createFixedPartition(String name) {
return new FixedPartitionAttributesImpl().setPartitionName(name)
.isPrimary(DEFAULT_PRIMARY_STATUS).setNumBuckets(DEFAULT_NUM_BUCKETS);
}
@@ -55,8 +54,7 @@ public abstract class FixedPartitionAttributes {
* @param name Name of the fixed partition.
* @param isPrimary True if this member is the primary for the partition.
*/
- final public static FixedPartitionAttributes createFixedPartition(String name,
- boolean isPrimary) {
+ public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary) {
return new FixedPartitionAttributesImpl().setPartitionName(name).isPrimary(isPrimary)
.setNumBuckets(DEFAULT_NUM_BUCKETS);
}
@@ -68,7 +66,7 @@ public abstract class FixedPartitionAttributes {
* @param isPrimary True if this member is the primary for the partition.
* @param numBuckets Number of buckets allowed for the partition.
*/
- final public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary,
+ public static FixedPartitionAttributes createFixedPartition(String name, boolean isPrimary,
int numBuckets) {
return new FixedPartitionAttributesImpl().setPartitionName(name).isPrimary(isPrimary)
.setNumBuckets(numBuckets);
@@ -80,7 +78,7 @@ public abstract class FixedPartitionAttributes {
* @param name Name of the fixed partition.
* @param numBuckets Number of buckets allowed for the partition.
*/
- final public static FixedPartitionAttributes createFixedPartition(String name, int numBuckets) {
+ public static FixedPartitionAttributes createFixedPartition(String name, int numBuckets) {
return new FixedPartitionAttributesImpl().setPartitionName(name)
.isPrimary(DEFAULT_PRIMARY_STATUS).setNumBuckets(numBuckets);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
index 79f7d8a..4479899 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/MembershipAttributes.java
@@ -16,12 +16,20 @@ package org.apache.geode.cache;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.distributed.internal.membership.InternalRole;
import org.apache.geode.distributed.Role;
+import org.apache.geode.distributed.internal.membership.InternalRole;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import java.io.*;
-import java.util.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
/**
* Configuration attributes for defining reliability requirements and behavior for a
@@ -142,7 +150,7 @@ public class MembershipAttributes implements DataSerializable, Externalizable {
return this.resumptionAction;
}
- private final Set<Role> toRoleSet(String[] roleNames) {
+ private Set<Role> toRoleSet(String[] roleNames) {
if (roleNames == null || roleNames.length == 0) {
return Collections.emptySet();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 593375e..a0cb7d4 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
@@ -274,7 +274,7 @@ public abstract class AbstractOp implements Op {
* @throws Exception if response could not be processed or we received a response with a server
* exception.
*/
- protected final Object processObjResponse(Message msg, String opName) throws Exception {
+ protected Object processObjResponse(Message msg, String opName) throws Exception {
Part part = msg.getPart(0);
final int msgType = msg.getMessageType();
if (msgType == MessageType.RESPONSE) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
index 3198b0d..54b4427 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionException.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.cache.execute;
import java.util.ArrayList;
@@ -37,8 +36,7 @@ import org.apache.geode.internal.Assert;
* <p>
* The exception string provides details on the cause of failure.
* </p>
- *
- *
+ *
* @since GemFire 6.0
* @see FunctionService
*/
@@ -92,7 +90,7 @@ public class FunctionException extends GemFireException {
* @param cause
* @since GemFire 6.5
*/
- public final void addException(Throwable cause) {
+ public void addException(Throwable cause) {
Assert.assertTrue(cause != null, "unexpected null exception to add to FunctionException");
getExceptions().add(cause);
}
@@ -102,7 +100,7 @@ public class FunctionException extends GemFireException {
*
* @since GemFire 6.5
*/
- public final List<Throwable> getExceptions() {
+ public List<Throwable> getExceptions() {
if (this.exceptions == null) {
this.exceptions = new ArrayList<Throwable>();
}
@@ -114,7 +112,7 @@ public class FunctionException extends GemFireException {
*
* @since GemFire 6.5
*/
- public final void addExceptions(Collection<? extends Throwable> ex) {
+ public void addExceptions(Collection<? extends Throwable> ex) {
getExceptions().addAll(ex);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
index d0cf5db..8a82181 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
@@ -113,7 +113,6 @@ import java.util.TreeMap;
* @since 1.2
* @since GemFire 7.1
*/
-
public class ObjectIntHashMap implements Cloneable, Serializable {
private static final long serialVersionUID = 7718697444988416372L;
@@ -761,21 +760,21 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
hash = h;
}
- public final Object getKey() {
+ public Object getKey() {
return key;
}
- public final int getValue() {
+ public int getValue() {
return value;
}
- public final int setValue(int newValue) {
+ public int setValue(int newValue) {
int oldValue = value;
value = newValue;
return oldValue;
}
- public final boolean equals(Object o) {
+ public boolean equals(Object o) {
if (!(o instanceof Entry))
return false;
Entry e = (Entry) o;
@@ -790,11 +789,11 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
return false;
}
- public final int hashCode() {
+ public int hashCode() {
return this.hash ^ value;
}
- public final String toString() {
+ public String toString() {
return getKey() + "=" + getValue();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
index 6324823..3e56801 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
@@ -39,7 +39,7 @@ public class SnappyCompressor implements Compressor, Serializable {
*
* @deprecated As of Geode 1.0, getDefaultInstance is deprecated. Use constructor instead.
*/
- public static final SnappyCompressor getDefaultInstance() {
+ public static SnappyCompressor getDefaultInstance() {
return new SnappyCompressor();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
index 007a990..ce66057 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
@@ -200,7 +200,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
* @param debug a boolean used to enable or disable debug mode.
* @see #isDebugging()
*/
- public final void setDebug(final boolean debug) {
+ public void setDebug(final boolean debug) {
this.debug = debug;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index 68aa9db..12c5c21 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -288,7 +288,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
*
* @return a reference to the Locator.
*/
- final InternalLocator getLocator() {
+ InternalLocator getLocator() {
return this.locator;
}
@@ -300,7 +300,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
* @see #getBindAddressAsString()
* @see #getPortAsString()
*/
- public final String getId() {
+ public String getId() {
return LocatorState.getBindAddressAsString(this).concat("[")
.concat(LocatorState.getPortAsString(this)).concat("]");
}
@@ -1510,7 +1510,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
return this;
}
- final boolean isBindAddressSpecified() {
+ boolean isBindAddressSpecified() {
return (getBindAddress() != null);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
index acd5e8a..a6d3064 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
@@ -328,7 +328,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* @return a reference to the Cache created by the GemFire Server start operation.
* @see org.apache.geode.cache.Cache
*/
- final Cache getCache() {
+ Cache getCache() {
if (this.cache != null) {
boolean isReconnecting = this.cache.isReconnecting();
if (isReconnecting) {
@@ -348,7 +348,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* @return a CacheConfig object with additional GemFire Cache configuration meta-data used on
* startup to configure the Cache.
*/
- public final CacheConfig getCacheConfig() {
+ public CacheConfig getCacheConfig() {
final CacheConfig copy = new CacheConfig();
copy.setDeclarativeConfig(this.cacheConfig);
return copy;
@@ -362,7 +362,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* @see #getServerBindAddressAsString()
* @see #getServerPortAsString()
*/
- public final String getId() {
+ public String getId() {
final StringBuilder buffer = new StringBuilder(ServerState.getServerBindAddressAsString(this));
final String serverPort = ServerState.getServerPortAsString(this);
@@ -899,7 +899,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* determined by the running flag and a connection to the distributed system (GemFire
* cluster).
*/
- final boolean isWaiting(final Cache cache) {
+ boolean isWaiting(final Cache cache) {
// return (isRunning() && !getCache().isClosed());
return (isRunning() && (cache.getDistributedSystem().isConnected() || cache.isReconnecting()));
}
@@ -952,7 +952,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* @param cache the Cache to which the server will be added.
* @throws IOException if the Cache server fails to start due to IO error.
*/
- final void startCacheServer(final Cache cache) throws IOException {
+ void startCacheServer(final Cache cache) throws IOException {
if (isDefaultServerEnabled(cache)) {
final String serverBindAddress =
(getServerBindAddress() == null ? null : getServerBindAddress().getHostAddress());
@@ -1894,7 +1894,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
*
* @return a boolean indicating if help was enabled.
*/
- protected final boolean isHelping() {
+ protected boolean isHelping() {
return Boolean.TRUE.equals(getHelp());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 4eb9888..0acc6c2 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
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.distributed.internal;
import org.apache.geode.CancelException;
@@ -37,7 +36,14 @@ import org.apache.logging.log4j.Logger;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -57,7 +63,6 @@ import java.util.concurrent.atomic.AtomicInteger;
* A primary design goal of this class is scalability: the footprint must be kept to a minimum as
* the number of instances grows across a growing number of members in the distributed system.
*
- *
* @since GemFire 3.0
*/
public class DistributionAdvisor {
@@ -242,7 +247,7 @@ public class DistributionAdvisor {
return advisor;
}
- protected final void initialize() {
+ protected void initialize() {
subInit();
getDistributionManager().addMembershipListener(this.ml);
}
@@ -1581,7 +1586,7 @@ public class DistributionAdvisor {
*
* @since GemFire 5.0
*/
- public final InternalDistributedMember getDistributedMember() {
+ public InternalDistributedMember getDistributedMember() {
return this.peerMemberId;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
index f4e547f..029e637 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionManager.java
@@ -14,16 +14,33 @@
*/
package org.apache.geode.distributed.internal;
-import org.apache.geode.*;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.CancelException;
+import org.apache.geode.ForcedDisconnectException;
+import org.apache.geode.IncompatibleSystemException;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.InvalidDeltaException;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.ToDataException;
import org.apache.geode.admin.GemFireHealthConfig;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.locks.ElderState;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.DistributedMembershipListener;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.MemberFactory;
+import org.apache.geode.distributed.internal.membership.MembershipManager;
+import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.OSProcess;
+import org.apache.geode.internal.SetUtils;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage;
import org.apache.geode.internal.admin.remote.RemoteGfManagerAgent;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
@@ -42,11 +59,31 @@ import org.apache.geode.internal.tcp.ReenteredConnectException;
import org.apache.geode.internal.util.concurrent.StoppableReentrantLock;
import org.apache.logging.log4j.Logger;
-import java.io.*;
+import java.io.NotSerializableException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* The <code>DistributionManager</code> uses a {@link MembershipManager} to distribute
@@ -3355,9 +3392,8 @@ public class DistributionManager implements DM {
/**
* Returns the executor for the given type of processor.
- *
*/
- public final Executor getExecutor(int processorType, InternalDistributedMember sender) {
+ public Executor getExecutor(int processorType, InternalDistributedMember sender) {
switch (processorType) {
case STANDARD_EXECUTOR:
return getThreadPool();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
index 403b420..bf11f7a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionMessage.java
@@ -56,8 +56,6 @@ import org.apache.geode.internal.util.Breadcrumbs;
* sequentialness/thread requirements of a message, extend DistributionMessage and implement
* getExecutor().
* </P>
- *
- *
*/
public abstract class DistributionMessage implements DataSerializableFixedID, Cloneable {
@@ -135,7 +133,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
* Get the next bit mask position while checking that the value should not exceed given maximum
* value.
*/
- protected static final int getNextBitMask(int mask, final int maxValue) {
+ protected static int getNextBitMask(int mask, final int maxValue) {
mask <<= 1;
if (mask > maxValue) {
Assert.fail("exhausted bit flags with all available bits: 0x" + Integer.toHexString(mask)
@@ -158,7 +156,7 @@ public abstract class DistributionMessage implements DataSerializableFixedID, Cl
this.doDecMessagesBeingReceived = v;
}
- public final void setReplySender(ReplySender acker) {
+ public void setReplySender(ReplySender acker) {
this.acker = acker;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
index 7e87c8c..d93487d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.distributed.internal;
import org.apache.geode.CancelCriterion;
@@ -34,7 +33,12 @@ import org.apache.geode.internal.util.Breadcrumbs;
import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
import org.apache.logging.log4j.Logger;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
/**
* This class processes responses to {@link DistributionMessage}s. It handles a the generic case of
@@ -69,8 +73,6 @@ import java.util.*;
* <p>
*
* @see MessageWithReply
- *
- *
* @since GemFire 2.1
*/
public class ReplyProcessor21 implements MembershipListener {
@@ -852,7 +854,7 @@ public class ReplyProcessor21 implements MembershipListener {
* @throws InternalGemFireException if ack-threshold was exceeded and system property
* "ack-threshold-exception" is set to true
*/
- public final void waitForRepliesUninterruptibly() throws ReplyException {
+ public void waitForRepliesUninterruptibly() throws ReplyException {
waitForRepliesUninterruptibly(0);
}
@@ -929,7 +931,7 @@ public class ReplyProcessor21 implements MembershipListener {
}
/** do processing required when finished */
- protected final void finished() {
+ protected void finished() {
boolean isDone = false;
synchronized (this) {
if (!this.done) { // make sure only called once
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
index 101ee63..7bb2de9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -82,7 +81,7 @@ public abstract class AbstractConfig implements Config {
* all values.
*/
@Override
- public final String toString() {
+ public String toString() {
return getClass().getName() + "@" + Integer.toHexString(hashCode());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 ae28120..98b1b44 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
@@ -22,7 +22,11 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.logging.log4j.Logger;
-import java.io.*;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UTFDataFormatException;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
@@ -35,21 +39,21 @@ import java.util.LinkedList;
* ByteArrayOutputStream.
* <p>
* This class is not thread safe
+ * <p>
+ * Added boolean flag that when turned on will throw an exception instead of allocating a new
+ * buffer. The exception is a BufferOverflowException thrown from expand, and will restore the
+ * position to the point at which the flag was set with the disallowExpansion method.
*
- * @since GemFire 5.0.2
- *
- *
+ * Usage Model: boolean succeeded = true; stream.disallowExpansion(); try {
+ * DataSerializer.writeObject(obj, stream); } catch (BufferOverflowException e) { succeeded = false;
+ * }
*
- * Added boolean flag that when turned on will throw an exception instead of allocating a new
- * buffer. The exception is a BufferOverflowException thrown from expand, and will restore
- * the position to the point at which the flag was set with the disallowExpansion method.
- * Usage Model: boolean succeeded = true; stream.disallowExpansion(); try {
- * DataSerializer.writeObject(obj, stream); } catch (BufferOverflowException e) { succeeded =
- * false; }
+ * @since GemFire 5.0.2
*/
public class HeapDataOutputStream extends OutputStream
implements ObjToByteArraySerializer, VersionedDataStream, ByteBufferWriter {
private static final Logger logger = LogService.getLogger();
+
ByteBuffer buffer;
protected LinkedList<ByteBuffer> chunks = null;
protected int size = 0;
@@ -163,7 +167,7 @@ public class HeapDataOutputStream extends OutputStream
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
index 17894ad..a187c65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
@@ -12,22 +12,23 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal;
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the
- * public domain, as explained at http://creativecommons.org/licenses/publicdomain
- */
-
-import java.util.concurrent.locks.*;
-import java.util.*;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.concurrent.locks.ReentrantLock;
/**
+ * Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the
+ * public domain, as explained at http://creativecommons.org/licenses/publicdomain
+ *
+ * <p>
* A hash table supporting full concurrency of retrievals and adjustable expected concurrency for
* updates. This class obeys the same functional specification as {@link java.util.Hashtable}, and
* includes versions of methods corresponding to each method of <tt>Hashtable</tt>. However, even
@@ -171,7 +172,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
* @param hash the hash code for the key
* @return the segment
*/
- final Segment<V> segmentFor(int hash) {
+ Segment<V> segmentFor(int hash) {
return segments[(hash >>> segmentShift) & segmentMask];
}
@@ -1005,7 +1006,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
return hasNext();
}
- final void advance() {
+ void advance() {
if (nextEntry != null && (nextEntry = nextEntry.next) != null)
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
index 7faebe9..83e1422 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SharedLibrary.java
@@ -222,7 +222,7 @@ public class SharedLibrary {
* @return returns a boolean indicating if the 64bit native library was loaded.
* @since GemFire 5.1
*/
- public final static boolean getIs64Bit() {
+ public static boolean getIs64Bit() {
return PureJavaMode.is64Bit();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
index 16227d2..bd6b60a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
@@ -435,7 +435,7 @@ public class SystemTimer {
* Does debug logging, catches critical errors, then delegates to {@link #run2()}
*/
@Override
- final public void run() {
+ public void run() {
final boolean isDebugEnabled = logger.isTraceEnabled();
if (isDebugEnabled) {
logger.trace("SystemTimer.MyTask: starting {}", this);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
index 81011d3..1958a85 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
@@ -14,16 +14,6 @@
*/
package org.apache.geode.internal.cache;
-import java.io.PrintStream;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.compression.Compressor;
@@ -42,19 +32,25 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
+import org.apache.logging.log4j.Logger;
+
+import java.io.PrintStream;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
import joptsimple.internal.Strings;
/**
* Code shared by both DiskRegion and RecoveredDiskRegion.
*
- *
* @since GemFire prPersistSprint2
*/
public abstract class AbstractDiskRegion implements DiskRegionView {
private static final Logger logger = LogService.getLogger();
- ////////////////////// Instance Fields ///////////////////////
-
private final DiskStoreImpl ds;
private final long id;
private long clearOplogEntryId = DiskStoreImpl.INVALID_ID;
@@ -235,11 +231,9 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
this.offHeap = drv.getOffHeap();
}
- ////////////////////// Instance Methods //////////////////////
-
public abstract String getName();
- public final DiskStoreImpl getDiskStore() {
+ public DiskStoreImpl getDiskStore() {
return this.ds;
}
@@ -380,15 +374,12 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
return PartitionedRegionHelper.getPRPath(bn);
}
-
-
private PersistentMemberID myInitializingId = null;
private PersistentMemberID myInitializedId = null;
private final CopyOnWriteHashSet<PersistentMemberID> onlineMembers;
private final CopyOnWriteHashSet<PersistentMemberID> offlineMembers;
private final CopyOnWriteHashSet<PersistentMemberID> equalMembers;
-
public PersistentMemberID addMyInitializingPMID(PersistentMemberID pmid) {
PersistentMemberID result = this.myInitializingId;
this.myInitializingId = pmid;
@@ -905,7 +896,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
public void dumpMetadata() {
String name = getName();
- // TODO - DAN - make this a flag
+ // TODO: make this a flag
// if (isBucket() && !DiskStoreImpl.TRACE_RECOVERY) {
// name = getPrName();
// }
@@ -976,7 +967,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
*
* @return an instance of BytesAndBits or Token.REMOVED_PHASE1
*/
- public final Object getRaw(DiskId id) {
+ public Object getRaw(DiskId id) {
this.acquireReadLock();
try {
return getDiskStore().getRaw(this, id);
@@ -1047,7 +1038,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
@Override
public void oplogRecovered(long oplogId) {
- // do nothing. Overriden in ExportDiskRegion
+ // do nothing. Overridden in ExportDiskRegion
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 bcaa0d0..988be0a 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
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import java.util.Iterator;
@@ -50,8 +49,6 @@ import org.apache.geode.internal.size.ReflectionSingleObjectSizer;
* Abstract implementation of {@link RegionMap} that adds LRU behaviour.
*
* @since GemFire 3.5.1
- *
- *
*/
public abstract class AbstractLRURegionMap extends AbstractRegionMap {
private static final Logger logger = LogService.getLogger();
@@ -263,7 +260,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
}
/** unsafe audit code. */
- public final void audit() {
+ public void audit() {
if (logger.isTraceEnabled(LogMarker.LRU)) {
logger.trace(LogMarker.LRU, "Size of LRUMap = {}", sizeInVM());
}
@@ -353,7 +350,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
*
* @param delta Description of the Parameter
*/
- protected final void changeTotalEntrySize(int delta) {
+ protected void changeTotalEntrySize(int delta) {
if (_isOwnerALocalRegion()) {
if (_getOwner() instanceof BucketRegion) {
BucketRegion bucketRegion = (BucketRegion) _getOwner();
@@ -577,7 +574,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
return resourceManager.getMemoryMonitor(offheap).getState().isEviction() && this.sizeInVM() > 0;
}
- public final int centralizedLruUpdateCallback() {
+ public int centralizedLruUpdateCallback() {
final boolean isDebugEnabled_LRU = logger.isTraceEnabled(LogMarker.LRU);
int evictedBytes = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
index 866ff03..bfeb941 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java
@@ -35,7 +35,7 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt
abstract void setDiskId(RegionEntry oldRe);
@Override
- public final void removePhase1(LocalRegion r, boolean isClear) throws RegionClearedException {
+ public void removePhase1(LocalRegion r, boolean isClear) throws RegionClearedException {
synchronized (this) {
Helper.removeFromDisk(this, r, isClear);
_removePhase1();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index ac5fb37..b7cd199 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -1529,7 +1529,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
*
* @since GemFire 5.0
*/
- final boolean isAllEvents() {
+ boolean isAllEvents() {
return getDataPolicy().withReplication()
|| getSubscriptionAttributes().getInterestPolicy().isAll();
}
@@ -1787,7 +1787,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
return this.cache;
}
- public final long cacheTimeMillis() {
+ public long cacheTimeMillis() {
return this.cache.getInternalDistributedSystem().getClock().cacheTimeMillis();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/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 5dcf3bc..a1b4a9d 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
@@ -3768,7 +3768,7 @@ public abstract class AbstractRegionMap implements RegionMap {
}
/** removes a tombstone that has expired locally */
- public final boolean removeTombstone(RegionEntry re, VersionHolder version, boolean isEviction,
+ public boolean removeTombstone(RegionEntry re, VersionHolder version, boolean isEviction,
boolean isScheduledTombstone) {
boolean result = false;
int destroyedVersion = version.getEntryVersion();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index 04a48d0..0c58963 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -71,7 +71,6 @@ import org.apache.geode.internal.util.StopWatch;
* Specialized {@link CacheDistributionAdvisor} for {@link BucketRegion BucketRegions}. The
* <code>BucketAdvisor</code> is owned by a {@link ProxyBucketRegion} and may outlive a
* <code>BucketRegion</code>.
- *
*/
@SuppressWarnings("synthetic-access")
public class BucketAdvisor extends CacheDistributionAdvisor {
@@ -1211,7 +1210,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
*
* @return the member or null if no primary exists
*/
- public final InternalDistributedMember basicGetPrimaryMember() {
+ public InternalDistributedMember basicGetPrimaryMember() {
return (InternalDistributedMember) this.primaryMember.get();
}
@@ -1882,7 +1881,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
*
* @return current number of hosts of this bucket ; -1 if there are no hosts
*/
- public final int getBucketRedundancy() {
+ public int getBucketRedundancy() {
return redundancy;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
index ad3f976..20cbd28 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java
@@ -12,14 +12,11 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.CacheEvent;
@@ -36,10 +33,9 @@ import org.apache.geode.internal.offheap.annotations.Retained;
/**
* Handles distribution messaging for destroying an entry in a region.
- *
- *
*/
public class DestroyOperation extends DistributedCacheOperation {
+
/** Creates a new instance of DestroyOperation */
public DestroyOperation(EntryEventImpl event) {
super(event);
@@ -116,8 +112,7 @@ public class DestroyOperation extends DistributedCacheOperation {
@Override
@Retained
- protected final InternalCacheEvent createEvent(DistributedRegion rgn)
- throws EntryNotFoundException {
+ protected InternalCacheEvent createEvent(DistributedRegion rgn) throws EntryNotFoundException {
EntryEventImpl ev = createEntryEvent(rgn);
boolean evReturned = false;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
index 6411353..4d85578 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java
@@ -36,10 +36,9 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* 1. It forwards TX operations to primary or a selected replica (in case of RR) for each op </br>
* 2.It also records those transactional operations in order to send those to
* secondaries/replicas(in one batch) at commit time.
- *
- *
*/
public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordinatorInterface {
+
private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null;
private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null;
private DistTXPrecommitMessage precommitDistTxMsg = null;
@@ -108,7 +107,7 @@ public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordi
}
@Override
- public final ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
+ public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
throws UnsupportedOperationInTransactionException {
return primaryTransactionalOperations;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
index 6c33c65..a2d2e9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
@@ -750,7 +750,7 @@ public abstract class DistributedCacheOperation {
// nothing to do here - see UpdateMessage
}
- protected final void waitForAckIfNeeded(CacheOperationMessage msg,
+ protected void waitForAckIfNeeded(CacheOperationMessage msg,
Map<InternalDistributedMember, PersistentMemberID> persistentIds) {
if (this.processor == null) {
return;
@@ -1068,7 +1068,7 @@ public abstract class DistributedCacheOperation {
}
@Override
- protected final void process(final DistributionManager dm) {
+ protected void process(final DistributionManager dm) {
Throwable thr = null;
boolean sendReply = true;
@@ -1481,7 +1481,7 @@ public abstract class DistributedCacheOperation {
}
}
- public final boolean supportsDirectAck() {
+ public boolean supportsDirectAck() {
return this.directAck;
}
@@ -1518,7 +1518,7 @@ public abstract class DistributedCacheOperation {
this.hasOldValue = true;
}
- protected final boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
+ protected boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
int oldLevel = LocalRegion.setThreadInitLevelRequirement(LocalRegion.ANY_INIT);
try {
LocalRegion lr = getLocalRegionForProcessing(dm);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index c26cd56..4dcb0b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -261,7 +260,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
}
}
- public final EntryEventImpl getBaseEvent() {
+ public EntryEventImpl getBaseEvent() {
return getEvent();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 485835b..650fe2a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -888,7 +888,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
}
@Override
- public final Object validatedDestroy(Object key, EntryEventImpl event)
+ public Object validatedDestroy(Object key, EntryEventImpl event)
throws TimeoutException, EntryNotFoundException, CacheWriterException {
Lock dlock = this.getDistributedLockIfGlobal(key);
try {
[02/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
index 9ab7406..354a9f7 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/AutoSerializableManager.java
@@ -744,14 +744,14 @@ public class AutoSerializableManager {
public abstract void orderedDeserialize(InternalPdxReader reader, Object obj);
- protected final Object readTransformIf(Object o, Object serializedValue)
+ protected Object readTransformIf(Object o, Object serializedValue)
throws IllegalArgumentException, IllegalAccessException {
if (!transform())
return serializedValue;
return readTransform(o, serializedValue);
}
- protected final Object readTransform(Object o, Object serializedValue)
+ protected Object readTransform(Object o, Object serializedValue)
throws IllegalArgumentException, IllegalAccessException {
return this.owner.getOwner().readTransform(getField(), o.getClass(), serializedValue);
}
@@ -850,7 +850,7 @@ public class AutoSerializableManager {
}
}
- public static final class IntField extends PdxFieldWrapper {
+ public static class IntField extends PdxFieldWrapper {
public IntField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -907,7 +907,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ByteField extends PdxFieldWrapper {
+ public static class ByteField extends PdxFieldWrapper {
public ByteField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -964,7 +964,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class LongField extends PdxFieldWrapper {
+ public static class LongField extends PdxFieldWrapper {
public LongField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1021,7 +1021,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class BooleanField extends PdxFieldWrapper {
+ public static class BooleanField extends PdxFieldWrapper {
public BooleanField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1078,7 +1078,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class CharField extends PdxFieldWrapper {
+ public static class CharField extends PdxFieldWrapper {
public CharField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1135,7 +1135,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ShortField extends PdxFieldWrapper {
+ public static class ShortField extends PdxFieldWrapper {
public ShortField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1192,7 +1192,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class FloatField extends PdxFieldWrapper {
+ public static class FloatField extends PdxFieldWrapper {
public FloatField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1249,7 +1249,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class DoubleField extends PdxFieldWrapper {
+ public static class DoubleField extends PdxFieldWrapper {
public DoubleField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1306,7 +1306,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ObjectField extends PdxFieldWrapper {
+ public static class ObjectField extends PdxFieldWrapper {
public ObjectField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1351,7 +1351,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class StringField extends PdxFieldWrapper {
+ public static class StringField extends PdxFieldWrapper {
public StringField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1396,7 +1396,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class DateField extends PdxFieldWrapper {
+ public static class DateField extends PdxFieldWrapper {
public DateField(AutoSerializableManager owner, Field f, String name, boolean transformValue,
boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1441,7 +1441,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ByteArrayField extends PdxFieldWrapper {
+ public static class ByteArrayField extends PdxFieldWrapper {
public ByteArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1486,7 +1486,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class BooleanArrayField extends PdxFieldWrapper {
+ public static class BooleanArrayField extends PdxFieldWrapper {
public BooleanArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1531,7 +1531,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ShortArrayField extends PdxFieldWrapper {
+ public static class ShortArrayField extends PdxFieldWrapper {
public ShortArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1576,7 +1576,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class CharArrayField extends PdxFieldWrapper {
+ public static class CharArrayField extends PdxFieldWrapper {
public CharArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1621,7 +1621,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class IntArrayField extends PdxFieldWrapper {
+ public static class IntArrayField extends PdxFieldWrapper {
public IntArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1666,7 +1666,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class LongArrayField extends PdxFieldWrapper {
+ public static class LongArrayField extends PdxFieldWrapper {
public LongArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1711,7 +1711,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class FloatArrayField extends PdxFieldWrapper {
+ public static class FloatArrayField extends PdxFieldWrapper {
public FloatArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1756,7 +1756,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class DoubleArrayField extends PdxFieldWrapper {
+ public static class DoubleArrayField extends PdxFieldWrapper {
public DoubleArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1801,7 +1801,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class StringArrayField extends PdxFieldWrapper {
+ public static class StringArrayField extends PdxFieldWrapper {
public StringArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1846,7 +1846,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ByteArrayArrayField extends PdxFieldWrapper {
+ public static class ByteArrayArrayField extends PdxFieldWrapper {
public ByteArrayArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
@@ -1891,7 +1891,7 @@ public class AutoSerializableManager {
}
}
}
- public static final class ObjectArrayField extends PdxFieldWrapper {
+ public static class ObjectArrayField extends PdxFieldWrapper {
public ObjectArrayField(AutoSerializableManager owner, Field f, String name,
boolean transformValue, boolean isIdentityField) {
super(owner, f, name, transformValue, isIdentityField);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
index 9ffc075..4dc4db7 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java
@@ -595,7 +595,7 @@ public class GeodeRedisServer {
}
}
- private final class MetaCacheListener extends CacheListenerAdapter<String, RedisDataType> {
+ private class MetaCacheListener extends CacheListenerAdapter<String, RedisDataType> {
@Override
public void afterCreate(EntryEvent<String, RedisDataType> event) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
index 928f345..f032316 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/Coder.java
@@ -107,7 +107,7 @@ public class Coder {
*/
public static final String N_INF = "-inf";
- public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, byte[] value) {
+ public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, byte[] value) {
ByteBuf response = alloc.buffer(value.length + 20);
response.writeByte(BULK_STRING_ID);
response.writeBytes(intToBytes(value.length));
@@ -117,7 +117,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, double value) {
+ public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, double value) {
ByteBuf response = alloc.buffer();
byte[] doub = doubleToBytes(value);
response.writeByte(BULK_STRING_ID);
@@ -128,7 +128,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getBulkStringResponse(ByteBufAllocator alloc, String value) {
+ public static ByteBuf getBulkStringResponse(ByteBufAllocator alloc, String value) {
byte[] valueAr = stringToBytes(value);
int length = valueAr == null ? 0 : valueAr.length;
ByteBuf response = alloc.buffer(length + 20);
@@ -140,8 +140,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
- List<String> items) {
+ public static ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc, List<String> items) {
Iterator<String> it = items.iterator();
ByteBuf response = alloc.buffer();
response.writeByte(ARRAY_ID);
@@ -158,7 +157,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
+ public static ByteBuf getBulkStringArrayResponse(ByteBufAllocator alloc,
Collection<ByteArrayWrapper> items) {
Iterator<ByteArrayWrapper> it = items.iterator();
ByteBuf response = alloc.buffer();
@@ -180,7 +179,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getKeyValArrayResponse(ByteBufAllocator alloc,
+ public static ByteBuf getKeyValArrayResponse(ByteBufAllocator alloc,
Collection<Entry<ByteArrayWrapper, ByteArrayWrapper>> items) {
Iterator<Map.Entry<ByteArrayWrapper, ByteArrayWrapper>> it = items.iterator();
ByteBuf response = alloc.buffer();
@@ -220,7 +219,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getScanResponse(ByteBufAllocator alloc, List<?> items) {
+ public static ByteBuf getScanResponse(ByteBufAllocator alloc, List<?> items) {
ByteBuf response = alloc.buffer();
response.writeByte(ARRAY_ID);
response.writeBytes(intToBytes(2));
@@ -258,12 +257,12 @@ public class Coder {
return response;
}
- public static final ByteBuf getEmptyArrayResponse(ByteBufAllocator alloc) {
+ public static ByteBuf getEmptyArrayResponse(ByteBufAllocator alloc) {
ByteBuf buf = alloc.buffer().writeBytes(bEMPTY_ARRAY);
return buf;
}
- public static final ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, String string) {
+ public static ByteBuf getSimpleStringResponse(ByteBufAllocator alloc, String string) {
byte[] simpAr = stringToBytes(string);
ByteBuf response = alloc.buffer(simpAr.length + 20);
@@ -273,7 +272,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getErrorResponse(ByteBufAllocator alloc, String error) {
+ public static ByteBuf getErrorResponse(ByteBufAllocator alloc, String error) {
byte[] errorAr = stringToBytes(error);
ByteBuf response = alloc.buffer(errorAr.length + 25);
response.writeByte(ERROR_ID);
@@ -283,7 +282,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getNoAuthResponse(ByteBufAllocator alloc, String error) {
+ public static ByteBuf getNoAuthResponse(ByteBufAllocator alloc, String error) {
byte[] errorAr = stringToBytes(error);
ByteBuf response = alloc.buffer(errorAr.length + 25);
response.writeByte(ERROR_ID);
@@ -293,7 +292,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getWrongTypeResponse(ByteBufAllocator alloc, String error) {
+ public static ByteBuf getWrongTypeResponse(ByteBufAllocator alloc, String error) {
byte[] errorAr = stringToBytes(error);
ByteBuf response = alloc.buffer(errorAr.length + 31);
response.writeByte(ERROR_ID);
@@ -303,7 +302,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getIntegerResponse(ByteBufAllocator alloc, int integer) {
+ public static ByteBuf getIntegerResponse(ByteBufAllocator alloc, int integer) {
ByteBuf response = alloc.buffer(15);
response.writeByte(INTEGER_ID);
response.writeBytes(intToBytes(integer));
@@ -311,7 +310,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getIntegerResponse(ByteBufAllocator alloc, long l) {
+ public static ByteBuf getIntegerResponse(ByteBufAllocator alloc, long l) {
ByteBuf response = alloc.buffer(25);
response.writeByte(INTEGER_ID);
response.writeBytes(longToBytes(l));
@@ -319,7 +318,7 @@ public class Coder {
return response;
}
- public static final ByteBuf getNilResponse(ByteBufAllocator alloc) {
+ public static ByteBuf getNilResponse(ByteBufAllocator alloc) {
ByteBuf buf = alloc.buffer().writeBytes(bNIL);
return buf;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
index 1de73a0..94ff50c 100644
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/RegionProvider.java
@@ -475,7 +475,7 @@ public class RegionProvider implements Closeable {
* @param delay The delay in milliseconds of the expiration
* @return True is expiration set, false otherwise
*/
- public final boolean setExpiration(ByteArrayWrapper key, long delay) {
+ public boolean setExpiration(ByteArrayWrapper key, long delay) {
RedisDataType type = getRedisDataType(key);
if (type == null)
return false;
@@ -492,7 +492,7 @@ public class RegionProvider implements Closeable {
* @param delay Delay in milliseconds to reset the expiration to
* @return True if reset, false if not
*/
- public final boolean modifyExpiration(ByteArrayWrapper key, long delay) {
+ public boolean modifyExpiration(ByteArrayWrapper key, long delay) {
/*
* Attempt to cancel future task
*/
@@ -517,7 +517,7 @@ public class RegionProvider implements Closeable {
* @param key Key
* @return True is expiration cancelled on the key, false otherwise
*/
- public final boolean cancelKeyExpiration(ByteArrayWrapper key) {
+ public boolean cancelKeyExpiration(ByteArrayWrapper key) {
ScheduledFuture<?> future = expirationsMap.remove(key);
if (future == null)
return false;
@@ -544,7 +544,7 @@ public class RegionProvider implements Closeable {
* @param key Key
* @return Remaining time in milliseconds or 0 if no delay or key doesn't exist
*/
- public final long getExpirationDelayMillis(ByteArrayWrapper key) {
+ public long getExpirationDelayMillis(ByteArrayWrapper key) {
ScheduledFuture<?> future = this.expirationsMap.get(key);
return future != null ? future.getDelay(TimeUnit.MILLISECONDS) : 0L;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
index e440c09..c1b0488 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/HllExecutor.java
@@ -26,7 +26,7 @@ public abstract class HllExecutor extends AbstractExecutor {
public static final Integer DEFAULT_HLL_DENSE = 18;
public static final Integer DEFAULT_HLL_SPARSE = 32;
- protected final void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
+ protected void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
Object oldVal = context.getRegionProvider().metaPutIfAbsent(key, RedisDataType.REDIS_HLL);
if (oldVal == RedisDataType.REDIS_PROTECTED)
throw new RedisDataTypeMismatchException("The key name \"" + key + "\" is protected");
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
index da370ce..783069a 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hll/Varint.java
@@ -48,7 +48,7 @@ import java.io.IOException;
* "compatible" with variable-length encoding.
* </p>
*/
-public final class Varint {
+public class Varint {
private Varint() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
index fd518b9..cb365e6 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/ListExecutor.java
@@ -32,7 +32,7 @@ public abstract class ListExecutor extends AbstractExecutor {
LEFT, RIGHT
};
- protected final static QueryService getQueryService() {
+ protected static QueryService getQueryService() {
return GemFireCacheImpl.getInstance().getQueryService();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
index 4466521..19bd199 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZRangeByLexExecutor.java
@@ -197,7 +197,7 @@ public class ZRangeByLexExecutor extends SortedSetExecutor {
}
- private final ByteBuf getCustomBulkStringArrayResponse(Collection<ByteArrayWrapper> items,
+ private ByteBuf getCustomBulkStringArrayResponse(Collection<ByteArrayWrapper> items,
ExecutionHandlerContext context) {
Iterator<ByteArrayWrapper> it = items.iterator();
ByteBuf response = context.getByteBufAllocator().buffer();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
index fb91f09..eb17e41 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/StringExecutor.java
@@ -22,7 +22,7 @@ import org.apache.geode.redis.internal.executor.AbstractExecutor;
public abstract class StringExecutor extends AbstractExecutor {
- protected final void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
+ protected void checkAndSetDataType(ByteArrayWrapper key, ExecutionHandlerContext context) {
Object oldVal = context.getRegionProvider().metaPutIfAbsent(key, RedisDataType.REDIS_STRING);
if (oldVal == RedisDataType.REDIS_PROTECTED)
throw new RedisDataTypeMismatchException("The key name \"" + key + "\" is protected");
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
index 22c0302..2cab06c 100644
--- a/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
+++ b/geode-core/src/main/java/org/apache/geode/security/GemFireSecurityException.java
@@ -76,7 +76,7 @@ public class GemFireSecurityException extends GemFireException {
}
@Override
- public final synchronized Throwable getCause() {
+ public synchronized Throwable getCause() {
return (this.cause == this ? null : this.cause);
}
@@ -86,7 +86,7 @@ public class GemFireSecurityException extends GemFireException {
* @param object the {@code object} to test for implementing {@code Serializable}.
* @return true if the provided {@code object} implements {@code Serializable}.
*/
- protected final boolean isSerializable(final Object object) {
+ protected boolean isSerializable(final Object object) {
if (object == null) {
return true;
}
@@ -100,7 +100,7 @@ public class GemFireSecurityException extends GemFireException {
* @return {@code NamingException#getResolvedObj()} if the {@code cause} is a
* {@code NamingException}.
*/
- protected final Object getResolvedObj() {
+ protected Object getResolvedObj() {
final Throwable thisCause = this.cause;
if (thisCause != null && NamingException.class.isInstance(thisCause)) {
return ((NamingException) thisCause).getResolvedObj();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 1f001b0..ee1fb38 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -249,7 +249,7 @@ public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTes
}
}
- protected final class TestEntryCacheListener extends CacheListenerAdapter<String, String> {
+ protected class TestEntryCacheListener extends CacheListenerAdapter<String, String> {
@Override
public void afterCreate(final EntryEvent<String, String> event) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 5db1559..8af44eb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -2443,7 +2443,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
/**
* Used to return and report remote CacheServer port info.
*/
- private static final class ServerPorts implements Serializable {
+ private static class ServerPorts implements Serializable {
private final int port;
ServerPorts(int port) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 634e9ba..c8f80a3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -375,7 +375,7 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTes
}
});
- final class LocalTestHook implements TestHook {
+ class LocalTestHook implements TestHook {
@Override
public void hook(int spot) throws RuntimeException {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index ae8da22..582ca5e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -279,7 +279,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
public void run2() throws CacheException {
// Helper classes and function
- final class TestQueryFunction extends FunctionAdapter {
+ class TestQueryFunction extends FunctionAdapter {
@Override
public boolean hasResult() {
@@ -1539,7 +1539,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
public void run2() throws CacheException {
// Helper classes and function
- final class TestQueryFunction extends FunctionAdapter {
+ class TestQueryFunction extends FunctionAdapter {
@Override
public boolean hasResult() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 827f2a7..77c66ad 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -2425,7 +2425,7 @@ public class PRQueryDUnitHelper implements Serializable {
}
// Helper classes and function
- final class TestQueryFunction extends FunctionAdapter {
+ class TestQueryFunction extends FunctionAdapter {
@Override
public boolean hasResult() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
index 196a88b..335f59b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
@@ -385,7 +385,7 @@ public class SnapshotDUnitTest extends JUnit4CacheTestCase {
}
}
- private static final class CountingAsyncEventListener implements AsyncEventListener {
+ private static class CountingAsyncEventListener implements AsyncEventListener {
private final AtomicInteger events = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index 8aae5d5..a6dd126 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -1568,7 +1568,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
// Simple DistributedMember implementation
- static final class TestDistributedMember implements DistributedMember {
+ static class TestDistributedMember implements DistributedMember {
private String host;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
index 9ac3ab0..ba630fa 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/decode/cp/CpUtf8.java
@@ -49,7 +49,7 @@ public class CpUtf8 extends Cp {
}
/**
- * decode the class name of the given argument, or the final class name if the argument is zero
+ * decode the class name of the given argument, or the class name if the argument is zero
*/
public String decodeClassName(int argNo) {
int idx;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index feba601..62d4bdd 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -249,7 +249,7 @@ public class AbstractLauncherTest {
+ TimeUnit.MINUTES.toMillis(30) + TimeUnit.SECONDS.toMillis(1)));
}
- private static final class FakeServiceLauncher extends AbstractLauncher<String> {
+ private static class FakeServiceLauncher extends AbstractLauncher<String> {
private final String memberId;
private final String memberName;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index 85bed3e..f5d6271 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -827,7 +827,7 @@ public class ServerLauncherTest {
serverLauncher.startCacheServer(mockCache);
}
- private final class ServerWaitMultiThreadedTestCase extends MultithreadedTestCase {
+ private class ServerWaitMultiThreadedTestCase extends MultithreadedTestCase {
private final AtomicBoolean connectionStateHolder = new AtomicBoolean(true);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index b9a601d..ccdd02e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -114,7 +114,7 @@ public class Bug40751DUnitTest extends JUnit4CacheTestCase {
}
- private static final class MyClass implements DataSerializable {
+ private static class MyClass implements DataSerializable {
public MyClass() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
index 3cdfd01..f17b40b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
@@ -86,7 +86,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
SpyAuthenticator.clear();
}
- protected static final class AuthInitCreateReturnsNull implements AuthInitialize {
+ protected static class AuthInitCreateReturnsNull implements AuthInitialize {
public static AuthInitialize create() {
return null;
@@ -106,7 +106,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class SpyAuthInit implements AuthInitialize {
+ protected static class SpyAuthInit implements AuthInitialize {
private static SpyAuthInit instance = null;
private static int createCount = 0;
@@ -151,7 +151,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
throws AuthenticationFailedException {}
}
- protected static final class AuthInitGetCredentialsAndInitThrow implements AuthInitialize {
+ protected static class AuthInitGetCredentialsAndInitThrow implements AuthInitialize {
public static AuthInitialize create() {
return new AuthInitGetCredentialsAndInitThrow();
@@ -173,7 +173,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class AuthInitGetCredentialsThrows implements AuthInitialize {
+ protected static class AuthInitGetCredentialsThrows implements AuthInitialize {
public static AuthInitialize create() {
return new AuthInitGetCredentialsThrows();
@@ -193,7 +193,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class AuthenticatorReturnsNulls implements Authenticator {
+ protected static class AuthenticatorReturnsNulls implements Authenticator {
public static Authenticator create() {
return null;
@@ -213,7 +213,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class AuthenticatorInitThrows implements Authenticator {
+ protected static class AuthenticatorInitThrows implements Authenticator {
public static Authenticator create() {
return new AuthenticatorInitThrows();
@@ -235,7 +235,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class AuthenticatorAuthenticateThrows implements Authenticator {
+ protected static class AuthenticatorAuthenticateThrows implements Authenticator {
public static Authenticator create() {
return new AuthenticatorAuthenticateThrows();
@@ -255,7 +255,7 @@ public abstract class AbstractGMSAuthenticatorTestCase {
public void close() {}
}
- protected static final class SpyAuthenticator implements Authenticator {
+ protected static class SpyAuthenticator implements Authenticator {
private static Authenticator instance = null;
private static int createCount = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
index 6bf9c35..6d1b493 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
@@ -205,7 +205,7 @@ public class StreamingOperationManyDUnitTest extends JUnit4DistributedTestCase {
}
}
- public static final class TestRequestStreamingMessageManyProviderNoExceptions
+ public static class TestRequestStreamingMessageManyProviderNoExceptions
extends StreamingOperation.RequestStreamingMessage {
private int nextInt = -10;
private int count = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
index 74fb665..310087e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
@@ -168,7 +168,7 @@ public class StreamingOperationOneDUnitTest extends JUnit4DistributedTestCase {
}
}
- public static final class TestRequestStreamingMessageOneProviderNoExceptions
+ public static class TestRequestStreamingMessageOneProviderNoExceptions
extends StreamingOperation.RequestStreamingMessage {
private int nextInt = -10;
private int count = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
index fe79801..bd9a424 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
@@ -1849,7 +1849,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
// spawn a new thread modify and custIdOne in another tx
// so that outer thread fails
- final class TxThread extends Thread {
+ class TxThread extends Thread {
public void run() {
CacheTransactionManager mgr = getGemfireCache().getTxManager();
mgr.setDistributed(true);
@@ -1931,7 +1931,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
}
- final class TxConflictRunnable implements Runnable {
+ class TxConflictRunnable implements Runnable {
final String regionName;
public TxConflictRunnable(String regionName) {
@@ -1942,7 +1942,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
public void run() {
// spawn a new thread modify and custIdOne in another tx
// so that outer thread fails
- final class TxThread extends Thread {
+ class TxThread extends Thread {
public boolean gotConflict = false;
public boolean gotOtherException = false;
public Exception ex = new Exception();
@@ -2071,7 +2071,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
}
- final class TxRunnable implements Runnable {
+ class TxRunnable implements Runnable {
final String regionName;
public TxRunnable(String regionName) {
@@ -2080,7 +2080,7 @@ public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
@Override
public void run() {
- final class TxThread extends Thread {
+ class TxThread extends Thread {
public boolean gotException = false;
public Exception ex = new Exception();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 33091c9..b42a923 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -236,7 +236,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
fromDataPre70Called = false;
}
- public static final class TestMessage implements DataSerializableFixedID {
+ public static class TestMessage implements DataSerializableFixedID {
/** The versions in which this message was modified */
private static final Version[] dsfidVersions = new Version[] {Version.GFE_66, Version.GFE_70};
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
index 14f05b1..b0f8b37 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TestDelta.java
@@ -25,7 +25,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.Delta;
import org.apache.geode.InvalidDeltaException;
-public final class TestDelta implements Delta, DataSerializable, Cloneable {
+public class TestDelta implements Delta, DataSerializable, Cloneable {
public boolean hasDelta;
public String info;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
index 89379dc..a378323 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtension.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
*
* @since GemFire 8.1
*/
-public final class MockCacheExtension extends AbstractMockExtension<Cache> {
+public class MockCacheExtension extends AbstractMockExtension<Cache> {
public MockCacheExtension(final String value) {
super(value);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
index f4f0412..235fe43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
*
* @since GemFire 8.1
*/
-public final class MockCacheExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Cache> {
+public class MockCacheExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Cache> {
public MockCacheExtensionXmlGenerator(MockCacheExtension extension) {
super(extension);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
index cff8337..9524803 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtension.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
*
* @since GemFire 8.1
*/
-public final class MockRegionExtension extends AbstractMockExtension<Region<?, ?>> {
+public class MockRegionExtension extends AbstractMockExtension<Region<?, ?>> {
public MockRegionExtension(final String value) {
super(value);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
index cf80b53..84aa1f9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
*
* @since GemFire 8.1
*/
-public final class MockRegionExtensionXmlGenerator
+public class MockRegionExtensionXmlGenerator
extends AbstractMockExtensionXmlGenerator<Region<?, ?>> {
public MockRegionExtensionXmlGenerator(MockRegionExtension extension) {
super(extension);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
index 5705c09..9eca33a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
@@ -139,8 +139,7 @@ public class Bug39356DUnitTest extends JUnit4CacheTestCase {
vm2.invoke(verifyBuckets);
}
- protected final class MyRegionObserver extends DistributionMessageObserver
- implements Serializable {
+ protected class MyRegionObserver extends DistributionMessageObserver implements Serializable {
private final VM vm0;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index ba3444c..3ee5cf0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -2238,8 +2238,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
vm3.invoke(createPersistentReplicate);
}
- private static final class RecoveryObserver
- extends InternalResourceManager.ResourceObserverAdapter {
+ private static class RecoveryObserver extends InternalResourceManager.ResourceObserverAdapter {
final CountDownLatch recoveryDone = new CountDownLatch(1);
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
index 0dd9775..9fa8d64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
@@ -243,7 +243,7 @@ public class StreamingPartitionOperationManyDUnitTest extends JUnit4CacheTestCas
}
}
- public static final class TestStreamingPartitionMessageManyProviderNoExceptions
+ public static class TestStreamingPartitionMessageManyProviderNoExceptions
extends StreamingPartitionOperation.StreamingPartitionMessage {
private int nextInt = -10;
private int count = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index d18bd66..1cf89c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -218,7 +218,7 @@ public class StreamingPartitionOperationOneDUnitTest extends JUnit4CacheTestCase
}
}
- public static final class TestStreamingPartitionMessageOneProviderNoExceptions
+ public static class TestStreamingPartitionMessageOneProviderNoExceptions
extends StreamingPartitionOperation.StreamingPartitionMessage {
private int nextInt = -10;
private int count = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index b7adff0..3dd0550 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -1690,7 +1690,7 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
});
}
- private static final class BucketMovingAsyncEventListener implements AsyncEventListener {
+ private static class BucketMovingAsyncEventListener implements AsyncEventListener {
private final DistributedMember destination;
private boolean moved;
private Set<Object> keysSeen = new HashSet<Object>();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 2b8690a..e45a06b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -156,7 +156,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
when(pa.getColocatedWith()).thenReturn(null);
- // final classes cannot be mocked
+ // classes cannot be mocked
ProxyBucketRegion pbr = new ProxyBucketRegion(BUCKET_ID, this.queueRegion, pbrIra);
when(ba.getProxyBucketRegion()).thenReturn(pbr);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index f904b07..dff049c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -141,7 +141,7 @@ public class AbstractXmlParserJUnitTest {
new MockXmlParser().skippedEntity(null);
}
- private static final class MockXmlParser extends AbstractXmlParser {
+ private static class MockXmlParser extends AbstractXmlParser {
@Override
public void startElement(String uri, String localName, String qName, Attributes atts)
throws SAXException {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
index cfb9f94..5f5d284 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
@@ -633,7 +633,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
});
}
- public static final class StatCompressor implements Compressor, Serializable {
+ public static class StatCompressor implements Compressor, Serializable {
private static final long serialVersionUID = 8116784819434199537L;
private final byte[] POST_COMPRESS_BYTES =
@@ -697,7 +697,7 @@ public class CompressionStatsDUnitTest extends JUnit4CacheTestCase {
/**
* Used to record compression statistics.
*/
- private static final class CompressionStats {
+ private static class CompressionStats {
long vmTotalCompressionTime = 0;
long region1TotalCompressionTime = 0;
long region2TotalCompressionTime = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 020dcfe..46ee1f4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -162,7 +162,7 @@ public class ObjectUtilsJUnitTest {
new Class[] {String.class}, " is the loneliest number!"));
}
- private static final class ValueHolder<T> {
+ private static class ValueHolder<T> {
private final T value;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
index fe318d2..30af492 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThreadUtilsJUnitTest.java
@@ -178,7 +178,7 @@ public class ThreadUtilsJUnitTest {
TestFramework.runOnce(new SleepInterruptedMultithreadedTestCase(10 * 1000));
}
- protected static final class SleepInterruptedMultithreadedTestCase extends MultithreadedTestCase {
+ protected static class SleepInterruptedMultithreadedTestCase extends MultithreadedTestCase {
private final long sleepDuration;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index f0acc40..7e0859f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -188,7 +188,7 @@ public class LifecycleListenerJUnitTest {
assertEquals(2, this.beforeCloseCallbacks.size());
}
- private static final class LifecycleListenerCallback {
+ private static class LifecycleListenerCallback {
private final MemoryAllocatorImpl allocator;
private final long timeStamp;
private final Throwable creationTime;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
index 3d0e321..1dc6c0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
@@ -461,8 +461,7 @@ public class AbstractSignalNotificationHandlerJUnitTest {
// notification verification handled by mockContext.assertIsSatisfied in tearDown()
}
- private static final class TestSignalNotificationHandler
- extends AbstractSignalNotificationHandler {
+ private static class TestSignalNotificationHandler extends AbstractSignalNotificationHandler {
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index a88157d..c21bfb8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -286,7 +286,7 @@ public class IOUtilsJUnitTest {
}
}
- private static final class MockFile extends File {
+ private static class MockFile extends File {
private boolean isGetAbsoluteFileCalled = false;
private boolean isGetCanonicalFileCalled = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
index 558c231..c36cbf0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/LoopHelpers.java
@@ -115,7 +115,7 @@ class LoopHelpers {
return x;
}
- public static final class XorShift32Random {
+ public static class XorShift32Random {
static final AtomicInteger seq = new AtomicInteger(8862213);
int x = -1831433054;
@@ -137,7 +137,7 @@ class LoopHelpers {
/** Multiplication-free RNG from Marsaglia "Xorshift RNGs" paper */
- public static final class MarsagliaRandom {
+ public static class MarsagliaRandom {
static final AtomicInteger seq = new AtomicInteger(3122688);
int x;
int y = 842502087;
@@ -164,7 +164,7 @@ class LoopHelpers {
/**
* Unsynchronized version of java.util.Random algorithm.
*/
- public static final class SimpleRandom {
+ public static class SimpleRandom {
private final static long multiplier = 0x5DEECE66DL;
private final static long addend = 0xBL;
private final static long mask = (1L << 48) - 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
index 6b952e0..d6f2579 100644
--- a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -2114,7 +2114,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
// Simple DistributedMember implementation
- static final class TestDistributedMember implements DistributedMember {
+ static class TestDistributedMember implements DistributedMember {
private final String host;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index c2882ca..e430215 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -262,7 +262,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
}
}
- private static final class Peer implements Serializable {
+ private static class Peer implements Serializable {
private final Properties distributedSystemProperties;
private final VM vm;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
index d3f331d..2ee53b8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/Stock.java
@@ -16,7 +16,7 @@ package org.apache.geode.management.internal.cli.domain;
import java.io.Serializable;
-public final class Stock implements Serializable {
+public class Stock implements Serializable {
private String key;
private double value;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
index 185ed4c..9a3ce86 100644
--- a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.SecurityTest;
* @since GemFire 6.1
*/
@Category({DistributedTest.class, SecurityTest.class})
-public final class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {
+public class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {
private DeltaTestImpl[] deltas = new DeltaTestImpl[8];
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
index f6febb3..2b26cdc 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
@@ -91,7 +91,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
* @deprecated in favor of just writing a test without this class
*/
@Deprecated
-public final class SecurityTestUtils {
+public class SecurityTestUtils {
private final JUnit4DistributedTestCase distributedTestCase = new JUnit4DistributedTestCase() {};
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
index 2cdce2c..13d68b5 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
@@ -290,7 +290,7 @@ public abstract class AuthzCredentialGenerator {
*
* @since GemFire 5.5
*/
- public static final class ClassCode {
+ public static class ClassCode {
private static byte nextOrdinal = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
index 885b91f..8695451 100755
--- a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
+++ b/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
@@ -187,7 +187,7 @@ public abstract class CredentialGenerator {
*
* @since GemFire 5.5
*/
- public static final class ClassCode {
+ public static class ClassCode {
private static byte nextOrdinal = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 60f47c4..8629749 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -585,7 +585,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
* Used to generate a cache.xml. Basically just a {@code CacheCreation} with a few more methods
* implemented.
*/
- private static final class TestCacheCreation extends CacheCreation {
+ private static class TestCacheCreation extends CacheCreation {
private boolean closed = false;
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
index 652f052..02e865b 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqConflatable.java
@@ -124,70 +124,70 @@ public class CqConflatable implements Conflatable, Serializable {
/**
* @return Returns the conflate.
*/
- final boolean isConflate() {
+ boolean isConflate() {
return conflate;
}
/**
* @param conflate The conflate to set.
*/
- final void setConflate(boolean conflate) {
+ void setConflate(boolean conflate) {
this.conflate = conflate;
}
/**
* @return Returns the id.
*/
- final EventID getId() {
+ EventID getId() {
return id;
}
/**
* @param id The id to set.
*/
- final void setId(EventID id) {
+ void setId(EventID id) {
this.id = id;
}
/**
* @return Returns the key.
*/
- final Object getKey() {
+ Object getKey() {
return key;
}
/**
* @param key The key to set.
*/
- final void setKey(Object key) {
+ void setKey(Object key) {
this.key = key;
}
/**
* @return Returns the regionname.
*/
- final String getRegionname() {
+ String getRegionname() {
return regionname;
}
/**
* @param regionname The regionname to set.
*/
- final void setRegionname(String regionname) {
+ void setRegionname(String regionname) {
this.regionname = regionname;
}
/**
* @return Returns the value.
*/
- final Object getValue() {
+ Object getValue() {
return value;
}
/**
* @param value The value to set.
*/
- final void setValue(Object value) {
+ void setValue(Object value) {
this.value = value;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index 54cadcb..ea4f128 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -85,7 +85,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
* @since GemFire 5.5
*/
-public final class CqServiceImpl implements CqService {
+public class CqServiceImpl implements CqService {
private static final Logger logger = LogService.getLogger();
private static final Integer MESSAGE_TYPE_LOCAL_CREATE = MessageType.LOCAL_CREATE;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
index 5fe391f..a038526 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/directory/FileIndexInput.java
@@ -23,7 +23,7 @@ import org.apache.lucene.store.IndexInput;
import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.SeekableInputStream;
-final class FileIndexInput extends IndexInput {
+class FileIndexInput extends IndexInput {
private final File file;
SeekableInputStream in;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
index 1d13964..4b7fd75 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileInputStream.java
@@ -22,7 +22,7 @@ import java.io.IOException;
* An input stream that reads chunks from a File saved in the region. This input stream will keep
* going back to the region to look for chunks until nothing is found.
*/
-final class FileInputStream extends SeekableInputStream {
+class FileInputStream extends SeekableInputStream {
private final File file;
private byte[] chunk = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
index 7eb8623..0c0dbe6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/filesystem/FileOutputStream.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
-final class FileOutputStream extends OutputStream {
+class FileOutputStream extends OutputStream {
private final File file;
private ByteBuffer buffer;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
index 6acd475..c9bfa15 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/xml/LuceneServiceXmlGenerator.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
-public final class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
+public class LuceneServiceXmlGenerator implements XmlGenerator<Cache> {
@Override
public String getNamspaceUri() {
return LuceneXmlConstants.NAMESPACE;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
index 2008458..600c819 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
@@ -554,7 +554,7 @@ public class FileSystemJUnitTest {
*
* To use, do this Mockito.mock(Interface, new SpyWrapper(Answer, o)
*/
- private static final class SpyWrapper implements Answer<Object> {
+ private static class SpyWrapper implements Answer<Object> {
private final CountOperations countOperations;
private Object region;
@@ -571,7 +571,7 @@ public class FileSystemJUnitTest {
}
}
- private static final class CountOperations implements Answer {
+ private static class CountOperations implements Answer {
public int count;
private int limit = Integer.MAX_VALUE;
private Runnable limitAction;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
index ce91202..5a91fc1 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseTestUtils.java
@@ -40,7 +40,7 @@ import org.apache.geode.tools.pulse.tests.PulseTestData;
import org.apache.geode.tools.pulse.tests.PulseTestLocators;
import org.apache.geode.tools.pulse.tests.Region;
-public final class PulseTestUtils {
+public class PulseTestUtils {
private static Supplier<WebDriver> driverProvider;
public static void setDriverProvider(Supplier<WebDriver> driverProvider) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
index 0cfcc37..f5a8fcf 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -86,7 +86,7 @@ public class LocatorDiscovery {
private static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger(
DistributionConfig.GEMFIRE_PREFIX + "LocatorDiscovery.FAILURE_LOG_MAX_INTERVAL", 300000);
- public final boolean skipFailureLogging(DistributionLocatorId locatorId) {
+ public boolean skipFailureLogging(DistributionLocatorId locatorId) {
boolean skipLogging = false;
if (this.failureLogInterval.size() < FAILURE_MAP_MAXSIZE) {
long[] logInterval = this.failureLogInterval.get(locatorId);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
index d6f997e..2db68c7 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
@@ -45,8 +45,7 @@ public class CustomMappingJackson2HttpMessageConverter extends MappingJackson2Ht
outputMessageWrapper.flush();
}
- protected static final class BufferingHttpOutputMessageWrapper
- implements HttpOutputMessageWrapper {
+ protected static class BufferingHttpOutputMessageWrapper implements HttpOutputMessageWrapper {
private final ByteArrayOutputStream outputStream;
@@ -125,7 +124,7 @@ public class CustomMappingJackson2HttpMessageConverter extends MappingJackson2Ht
}
- protected static final class ByteCountingOutputStream extends OutputStream {
+ protected static class ByteCountingOutputStream extends OutputStream {
private AtomicLong byteCount = new AtomicLong(0l);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index c61cd6b..4c760e7 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -134,8 +134,7 @@ public class LoginHandlerInterceptorJUnitTest {
TestFramework.runOnce(new HandlerInterceptorThreadSafetyMultiThreadedTestCase());
}
- private final class HandlerInterceptorThreadSafetyMultiThreadedTestCase
- extends MultithreadedTestCase {
+ private class HandlerInterceptorThreadSafetyMultiThreadedTestCase extends MultithreadedTestCase {
private LoginHandlerInterceptor handlerInterceptor;
[06/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
index f09a378..64b2284 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java
@@ -116,8 +116,7 @@ public abstract class AbstractExecution implements InternalExecution {
public static final byte HA_HASRESULT_OPTIMIZEFORWRITE_REEXECUTE = 15;
- public static final byte getFunctionState(boolean isHA, boolean hasResult,
- boolean optimizeForWrite) {
+ public static byte getFunctionState(boolean isHA, boolean hasResult, boolean optimizeForWrite) {
if (isHA) {
if (hasResult) {
if (optimizeForWrite) {
@@ -144,7 +143,7 @@ public abstract class AbstractExecution implements InternalExecution {
}
}
- public static final byte getReexecuteFunctionState(byte fnState) {
+ public static byte getReexecuteFunctionState(byte fnState) {
if (fnState == HA_HASRESULT_NO_OPTIMIZEFORWRITE) {
return HA_HASRESULT_NO_OPTIMIZEFORWRITE_REEXECUTE;
} else if (fnState == HA_HASRESULT_OPTIMIZEFORWRITE) {
@@ -238,16 +237,16 @@ public abstract class AbstractExecution implements InternalExecution {
return isFnSerializationReqd;
}
- public final Collection<InternalDistributedMember> getExecutionNodes() {
+ public Collection<InternalDistributedMember> getExecutionNodes() {
return this.executionNodes;
}
- public final void setRequireExecutionNodes(ExecutionNodesListener listener) {
+ public void setRequireExecutionNodes(ExecutionNodesListener listener) {
this.executionNodes = Collections.emptySet();
this.executionNodesListener = listener;
}
- public final void setExecutionNodes(Set<InternalDistributedMember> nodes) {
+ public void setExecutionNodes(Set<InternalDistributedMember> nodes) {
if (this.executionNodes != null) {
this.executionNodes = nodes;
if (this.executionNodesListener != null) {
@@ -256,7 +255,7 @@ public abstract class AbstractExecution implements InternalExecution {
}
}
- public final void executeFunctionOnLocalPRNode(final Function fn, final FunctionContext cx,
+ public void executeFunctionOnLocalPRNode(final Function fn, final FunctionContext cx,
final PartitionedRegionFunctionResultSender sender, DM dm, boolean isTx) {
if (dm instanceof DistributionManager && !isTx) {
if (ServerConnection.isExecuteFunctionOnLocalNodeOnly().byteValue() == 1) {
@@ -294,7 +293,7 @@ public abstract class AbstractExecution implements InternalExecution {
// Bug41118 : in case of lonerDistribuedSystem do local execution through
// main thread otherwise give execution to FunctionExecutor from
// DistributionManager
- public final void executeFunctionOnLocalNode(final Function fn, final FunctionContext cx,
+ public void executeFunctionOnLocalNode(final Function fn, final FunctionContext cx,
final ResultSender sender, DM dm, final boolean isTx) {
if (dm instanceof DistributionManager && !isTx) {
final DistributionManager newDM = (DistributionManager) dm;
@@ -318,7 +317,7 @@ public abstract class AbstractExecution implements InternalExecution {
}
}
- public final void executeFunctionLocally(final Function fn, final FunctionContext cx,
+ public void executeFunctionLocally(final Function fn, final FunctionContext cx,
final ResultSender sender, DM dm) {
FunctionStats stats = FunctionStats.getFunctionStats(fn.getId(), dm.getSystem());
@@ -396,7 +395,7 @@ public abstract class AbstractExecution implements InternalExecution {
return executeFunction(function);
}
- public final void setWaitOnExceptionFlag(boolean waitOnException) {
+ public void setWaitOnExceptionFlag(boolean waitOnException) {
this.setForwardExceptions(waitOnException);
this.waitOnException = waitOnException;
}
@@ -438,7 +437,7 @@ public abstract class AbstractExecution implements InternalExecution {
*/
public abstract void validateExecution(Function function, Set targetMembers);
- public final LocalResultCollector<?, ?> getLocalResultCollector(Function function,
+ public LocalResultCollector<?, ?> getLocalResultCollector(Function function,
final ResultCollector<?, ?> rc) {
if (rc instanceof LocalResultCollector) {
return (LocalResultCollector) rc;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
index c616cbd..39190f3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionContextImpl.java
@@ -63,7 +63,7 @@ public class FunctionContextImpl implements FunctionContext {
*
* @return the arguments or null if there are no arguments
*/
- public final Object getArguments() {
+ public Object getArguments() {
return this.args;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
index d0b7bb8..d0a0b88 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
*
*/
-public final class MemberFunctionResultSender implements InternalResultSender {
+public class MemberFunctionResultSender implements InternalResultSender {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
index 19b5421..3694e98 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/NoResult.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* @see Function#hasResult()
*
*/
-public final class NoResult implements ResultCollector, Serializable {
+public class NoResult implements ResultCollector, Serializable {
private static final long serialVersionUID = -4901369422864228848L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
index 9aa8262..5fb1f78 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
*/
-public final class PartitionedRegionFunctionResultSender implements InternalResultSender {
+public class PartitionedRegionFunctionResultSender implements InternalResultSender {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ha/QueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/QueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/QueueRemovalMessage.java
index 7879538..357d18c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/QueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/QueueRemovalMessage.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* that have been dispatched by this node. The messages are received by other nodes and the
* processing is handed over to an executor
*/
-public final class QueueRemovalMessage extends PooledDistributionMessage {
+public class QueueRemovalMessage extends PooledDistributionMessage {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
index 2a2a37c..c762158 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockBatch.java
@@ -33,7 +33,7 @@ import org.apache.geode.distributed.internal.membership.*;
* Adapts multiple TXRegionLockRequests to one DLockBatch for DLock to use.
*
*/
-public final class TXLockBatch implements DLockBatch, DataSerializableFixedID {
+public class TXLockBatch implements DLockBatch, DataSerializableFixedID {
/** Identifies the batch as a single entity */
private TXLockIdImpl txLockId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
index 848088b..0fd607c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockIdImpl.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.membership.*;
* Identifies a group of transaction locks.
*
*/
-public final class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
+public class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
private static final long serialVersionUID = 8579214625084490134L;
/** DistributionManager id for this member */
@@ -50,11 +50,11 @@ public final class TXLockIdImpl implements TXLockId, DataSerializableFixedID {
}
}
- public final int getCount() {
+ public int getCount() {
return this.id;
}
- public final InternalDistributedMember getMemberId() {
+ public InternalDistributedMember getMemberId() {
return this.memberId;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
index bd1ea6d..5d03abd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
@@ -46,7 +46,7 @@ import java.util.Set;
*
* @since GemFire 4.1.1
*/
-public final class TXLockUpdateParticipantsMessage extends PooledDistributionMessage
+public class TXLockUpdateParticipantsMessage extends PooledDistributionMessage
implements MessageWithReply {
private transient TXLockId txLockId;
@@ -144,7 +144,7 @@ public final class TXLockUpdateParticipantsMessage extends PooledDistributionMes
/**
* The simple reply message that the sender waits for
*/
- public static final class TXLockUpdateParticipantsReplyMessage extends ReplyMessage {
+ public static class TXLockUpdateParticipantsReplyMessage extends ReplyMessage {
@Override
public int getDSFID() {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
index 6deae63..0dc75ff 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java
@@ -120,7 +120,7 @@ public class TXOriginatorRecoveryProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// TXOriginatorRecoveryMessage
// -------------------------------------------------------------------------
- public static final class TXOriginatorRecoveryMessage extends PooledDistributionMessage
+ public static class TXOriginatorRecoveryMessage extends PooledDistributionMessage
implements MessageWithReply {
/** The transaction lock for which the originator orphaned */
@@ -266,7 +266,7 @@ public class TXOriginatorRecoveryProcessor extends ReplyProcessor21 {
// -------------------------------------------------------------------------
// TXOriginatorRecoveryReplyMessage
// -------------------------------------------------------------------------
- public static final class TXOriginatorRecoveryReplyMessage extends ReplyMessage {
+ public static class TXOriginatorRecoveryReplyMessage extends ReplyMessage {
/** The transaction lock for which the originator orphaned */
protected TXLockId txLockId; // only for the toString
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
index ea8018a..105d4de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUStatistics.java
@@ -44,7 +44,7 @@ public class HeapLRUStatistics extends LRUStatistics {
* @see EnableLRU#mustEvict
*/
@Override
- final public void updateCounter(long delta) {
+ public void updateCounter(long delta) {
super.updateCounter(delta);
}
@@ -54,7 +54,7 @@ public class HeapLRUStatistics extends LRUStatistics {
* <b>NOT</b> reset the counter value.
*/
@Override
- final public void resetCounter() {
+ public void resetCounter() {
super.resetCounter();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
index 98e007c..f1972a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUCapacityController.java
@@ -51,7 +51,7 @@ import java.util.*;
*
* @since GemFire 2.0.2
*/
-public final class LRUCapacityController extends LRUAlgorithm implements Declarable {
+public class LRUCapacityController extends LRUAlgorithm implements Declarable {
private static final long serialVersionUID = -4383074909189355938L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
index 1694f1b..17673a3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/MemLRUCapacityController.java
@@ -74,7 +74,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 2.0.2
*/
-public final class MemLRUCapacityController extends LRUAlgorithm implements Declarable {
+public class MemLRUCapacityController extends LRUAlgorithm implements Declarable {
private static final long serialVersionUID = 6364183985590572514L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
index bbfef42..ccab3c7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/NewLRUClockHand.java
@@ -141,7 +141,7 @@ public class NewLRUClockHand {
*
* @param aNode Description of the Parameter
*/
- public final void appendEntry(final LRUClockNode aNode) {
+ public void appendEntry(final LRUClockNode aNode) {
synchronized (this.lock) {
if (aNode.nextLRUNode() != null || aNode.prevLRUNode() != null) {
return;
@@ -408,7 +408,7 @@ public class NewLRUClockHand {
protected static class HeadLock extends Object {
}
- private static final class GuardNode implements LRUClockNode {
+ private static class GuardNode implements LRUClockNode {
private LRUClockNode next;
LRUClockNode prev;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
index 8b4cea7..910de64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 6.6
*/
-public final class AllBucketProfilesUpdateMessage extends DistributionMessage
+public class AllBucketProfilesUpdateMessage extends DistributionMessage
implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
@@ -54,7 +54,7 @@ public final class AllBucketProfilesUpdateMessage extends DistributionMessage
public AllBucketProfilesUpdateMessage() {}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.WAITING_POOL_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
index eeb3704..b5de2e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage.java
@@ -113,8 +113,8 @@ public class BecomePrimaryBucketMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
// this is executing in the WAITING_POOL_EXECUTOR
byte responseCode = BecomePrimaryBucketReplyMessage.NOT_SECONDARY;
@@ -158,7 +158,7 @@ public class BecomePrimaryBucketMessage extends PartitionMessage {
out.writeBoolean(this.isRebalance);
}
- public static final class BecomePrimaryBucketReplyMessage extends ReplyMessage {
+ public static class BecomePrimaryBucketReplyMessage extends ReplyMessage {
static final byte NOT_SECONDARY = 0;
static final byte OK = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
index 122791d..8d164c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessage.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.0
*/
-public final class BucketBackupMessage extends PartitionMessage {
+public class BucketBackupMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
index e413033..e353393 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage.java
@@ -42,8 +42,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 5.1
*/
-public final class BucketProfileUpdateMessage extends DistributionMessage
- implements MessageWithReply {
+public class BucketProfileUpdateMessage extends DistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
@@ -55,7 +54,7 @@ public final class BucketProfileUpdateMessage extends DistributionMessage
public BucketProfileUpdateMessage() {}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.WAITING_POOL_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
index ed17740..ee5d1be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/BucketSizeMessage.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* @since GemFire 5.0
*/
-public final class BucketSizeMessage extends PartitionMessage {
+public class BucketSizeMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/** The list of buckets whose size is needed, if null, then all buckets */
@@ -66,7 +66,7 @@ public final class BucketSizeMessage extends PartitionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.STANDARD_EXECUTOR;
}
@@ -135,7 +135,7 @@ public final class BucketSizeMessage extends PartitionMessage {
out.writeInt(this.bucketId); // fix for bug 38228
}
- public static final class BucketSizeReplyMessage extends HighPriorityDistributionMessage {
+ public static class BucketSizeReplyMessage extends HighPriorityDistributionMessage {
/** The shared obj id of the ReplyProcessor */
private int processorId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
index d6422c2..709cb13 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage.java
@@ -44,7 +44,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
-public final class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
+public class ContainsKeyValueMessage extends PartitionMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private boolean valueCheck;
@@ -169,7 +169,7 @@ public final class ContainsKeyValueMessage extends PartitionMessageWithDirectRep
out.writeInt(this.bucketId.intValue());
}
- public static final class ContainsKeyValueReplyMessage extends ReplyMessage {
+ public static class ContainsKeyValueReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private boolean containsKeyValue;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
index 744e013..90f3396 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
@@ -55,7 +55,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* @since GemFire 6.0
*
*/
-public final class CreateBucketMessage extends PartitionMessage {
+public class CreateBucketMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/** The key associated with the value that must be sent */
@@ -81,7 +81,7 @@ public final class CreateBucketMessage extends PartitionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.WAITING_POOL_EXECUTOR;
}
@@ -194,7 +194,7 @@ public final class CreateBucketMessage extends PartitionMessage {
*
* @since GemFire 5.0
*/
- public static final class CreateBucketReplyMessage extends ReplyMessage {
+ public static class CreateBucketReplyMessage extends ReplyMessage {
private InternalDistributedMember primary;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
index e72e2cf..18503c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateMissingBucketsTask.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.PartitionedRegion.RecoveryLock;
* A task for creating buckets in a child colocated region that are present in the leader region.
*
*/
-public final class CreateMissingBucketsTask extends RecoveryRunnable {
+public class CreateMissingBucketsTask extends RecoveryRunnable {
public CreateMissingBucketsTask(PRHARedundancyProvider prhaRedundancyProvider) {
super(prhaRedundancyProvider);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
index f305fa8..f1633bd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage.java
@@ -134,7 +134,7 @@ public class DeposePrimaryBucketMessage extends PartitionMessage {
out.writeInt(this.bucketId);
}
- public static final class DeposePrimaryBucketReplyMessage extends ReplyMessage {
+ public static class DeposePrimaryBucketReplyMessage extends ReplyMessage {
/**
* Empty constructor to conform to DataSerializable interface
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
index bffaf4d..7009a98 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
@@ -442,19 +442,19 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
}
}
- protected final Object getKey() {
+ protected Object getKey() {
return this.key;
}
- private final void setKey(Object key) {
+ private void setKey(Object key) {
this.key = key;
}
- public final Operation getOperation() {
+ public Operation getOperation() {
return this.op;
}
- protected final Object getCallbackArg() {
+ protected Object getCallbackArg() {
return this.cbArg;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
index 9bbc39d..d0c959c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
*
* @since GemFire 5.0
*/
-public final class DestroyRegionOnDataStoreMessage extends PartitionMessage {
+public class DestroyRegionOnDataStoreMessage extends PartitionMessage {
private Object callbackArg;
@@ -101,13 +101,13 @@ public final class DestroyRegionOnDataStoreMessage extends PartitionMessage {
}
@Override
- public final void fromData(final DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(final DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
callbackArg = DataSerializer.readObject(in);
}
@Override
- public final void toData(final DataOutput out) throws IOException {
+ public void toData(final DataOutput out) throws IOException {
super.toData(out);
DataSerializer.writeObject(callbackArg, out);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
index 08daeb7..07b293b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpAllPRConfigMessage.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @see org.apache.geode.internal.cache.PartitionedRegion#sendDumpAllPartitionedRegions()
*/
-public final class DumpAllPRConfigMessage extends PartitionMessage {
+public class DumpAllPRConfigMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
public DumpAllPRConfigMessage() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
index 6314f2d..220c51f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @see org.apache.geode.internal.cache.PartitionedRegion#sendDumpB2NRegionForBucket(int)
*/
-public final class DumpB2NRegion extends PartitionMessage {
+public class DumpB2NRegion extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private int bucketId;
@@ -167,7 +167,7 @@ public final class DumpB2NRegion extends PartitionMessage {
- public static final class DumpB2NReplyMessage extends ReplyMessage {
+ public static class DumpB2NReplyMessage extends ReplyMessage {
private PrimaryInfo primaryInfo;
public DumpB2NReplyMessage() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
index d924b69..b8bd629 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpBucketsMessage.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @see org.apache.geode.internal.cache.PartitionedRegion#dumpAllBuckets(boolean)
*/
-public final class DumpBucketsMessage extends PartitionMessage {
+public class DumpBucketsMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
boolean validateOnly;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
index 0502d5f..355c3b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
@@ -90,8 +90,8 @@ public class EndBucketCreationMessage extends PartitionMessage {
}
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm,
- PartitionedRegion region, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion region,
+ long startTime) throws ForceReattemptException {
// this is executing in the WAITING_POOL_EXECUTOR
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
index 41186ff..b767f6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -63,7 +63,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 8.0
*/
-public final class FetchBulkEntriesMessage extends PartitionMessage {
+public class FetchBulkEntriesMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private HashSet<Integer> bucketIds;
@@ -174,7 +174,7 @@ public final class FetchBulkEntriesMessage extends PartitionMessage {
DataSerializer.writePrimitiveBoolean(this.allowTombstones, out);
}
- public static final class FetchBulkEntriesReplyMessage extends ReplyMessage {
+ public static class FetchBulkEntriesReplyMessage extends ReplyMessage {
/** Whether this message is the last of a series of chunk responses */
boolean lastInSeries;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
index c7ca279..489ffba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessage.java
@@ -65,7 +65,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.OffHeapHelper;
import org.apache.geode.internal.util.ObjectIntProcedure;
-public final class FetchEntriesMessage extends PartitionMessage {
+public class FetchEntriesMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private int bucketId;
@@ -150,7 +150,7 @@ public final class FetchEntriesMessage extends PartitionMessage {
out.writeInt(this.bucketId);
}
- public static final class FetchEntriesReplyMessage extends ReplyMessage {
+ public static class FetchEntriesReplyMessage extends ReplyMessage {
/** The bucket id */
int bucketId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
index 301e154..664ebe7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessage.java
@@ -58,7 +58,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.1
*/
-public final class FetchEntryMessage extends PartitionMessage {
+public class FetchEntryMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private Object key;
@@ -218,7 +218,7 @@ public final class FetchEntryMessage extends PartitionMessage {
*
* @since GemFire 5.0
*/
- public static final class FetchEntryReplyMessage extends ReplyMessage {
+ public static class FetchEntryReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private EntrySnapshot value;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
index e1c708a..67d81ef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.util.ObjectIntProcedure;
-public final class FetchKeysMessage extends PartitionMessage {
+public class FetchKeysMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private Integer bucketId;
@@ -217,7 +217,7 @@ public final class FetchKeysMessage extends PartitionMessage {
out.writeBoolean(this.allowTombstones);
}
- public static final class FetchKeysReplyMessage extends ReplyMessage {
+ public static class FetchKeysReplyMessage extends ReplyMessage {
/** The number of the series */
int seriesNum;
/** The message number in the series */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
index 5f4dec1..21dfa8d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
@@ -145,7 +145,7 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
DataSerializer.writeObject(loadProbe, out);
}
- public static final class FetchPartitionDetailsReplyMessage extends ReplyMessage {
+ public static class FetchPartitionDetailsReplyMessage extends ReplyMessage {
static final byte NO_PARTITION = 0;
static final byte OK = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
index 96d838d..34d530b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 5.1
*/
-public final class FlushMessage extends SerialDistributionMessage implements MessageWithReply {
+public class FlushMessage extends SerialDistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
index 1c2a6a7..d0cd938 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
@@ -64,7 +64,7 @@ import java.util.Set;
*
* @since GemFire 5.0
*/
-public final class GetMessage extends PartitionMessageWithDirectReply {
+public class GetMessage extends PartitionMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private Object key;
@@ -102,7 +102,7 @@ public final class GetMessage extends PartitionMessageWithDirectReply {
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "order-pr-gets");
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
if (!forceUseOfPRExecutor && !ORDER_PR_GETS && !isDirectAck()) {
try {
PartitionedRegion pr = PartitionedRegion.getPRFromId(this.regionId);
@@ -145,8 +145,8 @@ public final class GetMessage extends PartitionMessageWithDirectReply {
}
@Override
- protected final boolean operateOnPartitionedRegion(final DistributionManager dm,
- PartitionedRegion r, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(final DistributionManager dm, PartitionedRegion r,
+ long startTime) throws ForceReattemptException {
if (logger.isTraceEnabled(LogMarker.DM)) {
logger.trace(LogMarker.DM, "GetMessage operateOnRegion: {}", r.getFullPath());
}
@@ -298,7 +298,7 @@ public final class GetMessage extends PartitionMessageWithDirectReply {
*
* @since GemFire 5.0
*/
- public static final class GetReplyMessage extends ReplyMessage {
+ public static class GetReplyMessage extends ReplyMessage {
/**
* The raw value in the cache which may be serialized to the output stream, if it is NOT already
* a byte array
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
index e8595fa..a99fd7a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.0
*/
-public final class IdentityRequestMessage extends DistributionMessage implements MessageWithReply {
+public class IdentityRequestMessage extends DistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
private static final int UNINITIALIZED = -1;
@@ -166,7 +166,7 @@ public final class IdentityRequestMessage extends DistributionMessage implements
*
* @since GemFire 5.0
*/
- public static final class IdentityReplyMessage extends HighPriorityDistributionMessage {
+ public static class IdentityReplyMessage extends HighPriorityDistributionMessage {
private int Id = UNINITIALIZED;
/** The shared obj id of the ReplyProcessor */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
index 3ac9ee0..419e083 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
-public final class IdentityUpdateMessage extends DistributionMessage implements MessageWithReply {
+public class IdentityUpdateMessage extends DistributionMessage implements MessageWithReply {
private static final Logger logger = LogService.getLogger();
private int processorId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
index 86c47e7..dc76652 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
@@ -90,7 +90,7 @@ public class IndexCreationMsg extends PartitionMessage {
* of the initialization
*/
@Override
- protected final boolean failIfRegionMissing() {
+ protected boolean failIfRegionMissing() {
return false;
}
@@ -179,7 +179,7 @@ public class IndexCreationMsg extends PartitionMessage {
* Process this index creation message on the receiver.
*/
@Override
- public final void process(final DistributionManager dm) {
+ public void process(final DistributionManager dm) {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -413,7 +413,7 @@ public class IndexCreationMsg extends PartitionMessage {
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.indexDefinitions = DataSerializer.readHashSet(in);
}
@@ -424,7 +424,7 @@ public class IndexCreationMsg extends PartitionMessage {
}
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
super.toData(out);
DataSerializer.writeHashSet(this.indexDefinitions, out);
}
@@ -433,7 +433,7 @@ public class IndexCreationMsg extends PartitionMessage {
* String representation of this message.
*/
@Override
- public final String toString() {
+ public String toString() {
StringBuffer sb = new StringBuffer();
for (IndexCreationData icd : indexDefinitions) {
sb.append(icd.getIndexName()).append(" ");
@@ -546,7 +546,7 @@ public class IndexCreationMsg extends PartitionMessage {
*
*
*/
- public static final class IndexCreationReplyMsg extends ReplyMessage {
+ public static class IndexCreationReplyMsg extends ReplyMessage {
/** Index created or not. */
private boolean result;
@@ -634,7 +634,7 @@ public class IndexCreationMsg extends PartitionMessage {
* @param dm distribution manager
*/
@Override
- public final void process(final DM dm, final ReplyProcessor21 p) {
+ public void process(final DM dm, final ReplyProcessor21 p) {
if (logger.isDebugEnabled()) {
logger.debug("Processor id is : {}", this.processorId);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
index 8259818..227c74e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InterestEventMessage.java
@@ -63,13 +63,13 @@ public class InterestEventMessage extends PartitionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.STANDARD_EXECUTOR;
}
@Override
- protected final boolean operateOnPartitionedRegion(final DistributionManager dm,
- PartitionedRegion r, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(final DistributionManager dm, PartitionedRegion r,
+ long startTime) throws ForceReattemptException {
if (logger.isTraceEnabled(LogMarker.DM)) {
logger.debug("InterestEventMessage operateOnPartitionedRegion: {}", r.getFullPath());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
index 8db893a..00db87c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.offheap.annotations.Released;
-public final class InvalidateMessage extends DestroyMessage {
+public class InvalidateMessage extends DestroyMessage {
private static final Logger logger = LogService.getLogger();
/**
@@ -247,7 +247,7 @@ public final class InvalidateMessage extends DestroyMessage {
return PR_INVALIDATE_MESSAGE;
}
- public static final class InvalidateReplyMessage extends ReplyMessage {
+ public static class InvalidateReplyMessage extends ReplyMessage {
VersionTag versionTag;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
index 786006e..cca8953 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* @since GemFire 5.0
*
*/
-public final class ManageBackupBucketMessage extends PartitionMessage {
+public class ManageBackupBucketMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/** The key associated with the value that must be sent */
@@ -85,7 +85,7 @@ public final class ManageBackupBucketMessage extends PartitionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.WAITING_POOL_EXECUTOR;
}
@@ -217,7 +217,7 @@ public final class ManageBackupBucketMessage extends PartitionMessage {
*
* @since GemFire 5.0
*/
- public static final class ManageBackupBucketReplyMessage extends ReplyMessage {
+ public static class ManageBackupBucketReplyMessage extends ReplyMessage {
protected boolean acceptedBucket;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
index 1092145..7e84404 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
* @since GemFire 5.0
*
*/
-public final class ManageBucketMessage extends PartitionMessage {
+public class ManageBucketMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
/** The key associated with the value that must be sent */
@@ -80,7 +80,7 @@ public final class ManageBucketMessage extends PartitionMessage {
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.WAITING_POOL_EXECUTOR;
}
@@ -211,7 +211,7 @@ public final class ManageBucketMessage extends PartitionMessage {
*
* @since GemFire 5.0
*/
- public static final class ManageBucketReplyMessage extends ReplyMessage {
+ public static class ManageBucketReplyMessage extends ReplyMessage {
protected boolean acceptedBucket;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
index 8a607c0..6f18013 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessage.java
@@ -143,7 +143,7 @@ public class MoveBucketMessage extends PartitionMessage {
DataSerializer.writeObject(this.source, out);
}
- public static final class MoveBucketReplyMessage extends ReplyMessage {
+ public static class MoveBucketReplyMessage extends ReplyMessage {
private boolean moved;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
index a125dbe..1cbad83 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRLoad.java
@@ -27,7 +27,7 @@ import org.apache.geode.DataSerializer;
*
* @since GemFire 6.0
*/
-public final class PRLoad implements DataSerializable {
+public class PRLoad implements DataSerializable {
private static final long serialVersionUID = 778886995284953922L;
private final float weight;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
index 5c5af24..e835fce 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage.java
@@ -39,7 +39,7 @@ import java.util.Set;
*
*
*/
-public final class PRSanityCheckMessage extends PartitionMessage {
+public class PRSanityCheckMessage extends PartitionMessage {
private String regionName;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
index 3552b5d..0e27621 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRTombstoneMessage.java
@@ -50,7 +50,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 7.0
*/
-public final class PRTombstoneMessage extends PartitionMessageWithDirectReply
+public class PRTombstoneMessage extends PartitionMessageWithDirectReply
implements SerializationVersions {
private static final Logger logger = LogService.getLogger();
@@ -93,8 +93,8 @@ public final class PRTombstoneMessage extends PartitionMessageWithDirectReply
}
@Override
- protected final boolean operateOnPartitionedRegion(final DistributionManager dm,
- PartitionedRegion r, long startTime) throws ForceReattemptException {
+ protected boolean operateOnPartitionedRegion(final DistributionManager dm, PartitionedRegion r,
+ long startTime) throws ForceReattemptException {
if (logger.isTraceEnabled(LogMarker.DM)) {
logger.debug("PRTombstoneMessage operateOnRegion: {}", r.getFullPath());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
index eb7dcaf..b214075 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
@@ -221,7 +221,7 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
* Response for PartitionMessage {@link PRUpdateEntryVersionMessage}.
*
*/
- public static final class UpdateEntryVersionResponse extends PartitionResponse {
+ public static class UpdateEntryVersionResponse extends PartitionResponse {
private volatile boolean versionUpdated;
private final Object key;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
index 5129044..6b59f51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessage.java
@@ -227,7 +227,7 @@ public abstract class PartitionMessage extends DistributionMessage
* @return the compact value that will be sent which represents the PartitionedRegion
* @see PartitionedRegion#getPRId()
*/
- public final int getRegionId() {
+ public int getRegionId() {
return regionId;
}
@@ -236,7 +236,7 @@ public abstract class PartitionMessage extends DistributionMessage
* is required.
*/
@Override
- public final int getProcessorId() {
+ public int getProcessorId() {
return this.processorId;
}
@@ -244,7 +244,7 @@ public abstract class PartitionMessage extends DistributionMessage
* @param processorId1 the {@link org.apache.geode.distributed.internal.ReplyProcessor21} id
* associated with the message, null if no acknowlegement is required.
*/
- public final void registerProcessor(int processorId1) {
+ public void registerProcessor(int processorId1) {
this.processorId = processorId1;
}
@@ -677,7 +677,7 @@ public abstract class PartitionMessage extends DistributionMessage
/**
* @return the txUniqId
*/
- public final int getTXUniqId() {
+ public int getTXUniqId() {
return txUniqId;
}
@@ -694,7 +694,7 @@ public abstract class PartitionMessage extends DistributionMessage
return true;
}
- protected final boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
+ protected boolean _mayAddToMultipleSerialGateways(DistributionManager dm) {
try {
PartitionedRegion pr = PartitionedRegion.getPRFromId(this.regionId);
if (pr == null) {
@@ -786,7 +786,7 @@ public abstract class PartitionMessage extends DistributionMessage
* @throws ForceReattemptException if the recipient left the distributed system before the
* response was received.
*/
- final public void waitForCacheException()
+ public void waitForCacheException()
throws CacheException, ForceReattemptException, PrimaryBucketException {
try {
waitForRepliesUninterruptibly();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
index f7ca7e6..2a37afc 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage.java
@@ -66,7 +66,7 @@ public class PartitionedRegionFunctionStreamingMessage extends PartitionMessage
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
index 888809d..e8241db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserverHolder.java
@@ -40,7 +40,7 @@ public class PartitionedRegionObserverHolder {
/**
* Set the given observer to be notified of events. Returns the current observer.
*/
- public static final PartitionedRegionObserver setInstance(PartitionedRegionObserver observer) {
+ public static PartitionedRegionObserver setInstance(PartitionedRegionObserver observer) {
Support.assertArg(observer != null, "setInstance expects a non-null argument!");
PartitionedRegionObserver oldObserver = _instance;
_instance = observer;
@@ -48,7 +48,7 @@ public class PartitionedRegionObserverHolder {
}
/** Return the current ClientServerObserver instance */
- public static final PartitionedRegionObserver getInstance() {
+ public static PartitionedRegionObserver getInstance() {
return _instance;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
index 75bd0b6..f053d5f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
*
*/
-public final class PrimaryRequestMessage extends PartitionMessage {
+public class PrimaryRequestMessage extends PartitionMessage {
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
@@ -136,7 +136,7 @@ public final class PrimaryRequestMessage extends PartitionMessage {
/**
* The reply to a PrimarRequestMessage, indicating if the sender is the primary
*/
- static public final class PrimaryRequestReplyMessage extends ReplyMessage {
+ static public class PrimaryRequestReplyMessage extends ReplyMessage {
private static final long serialVersionUID = 1L;
public volatile boolean isPrimary;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
index 1c41e61..b43bfc4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
@@ -75,7 +75,7 @@ import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.EN
*
* @since GemFire 5.0
*/
-public final class PutMessage extends PartitionMessageWithDirectReply implements NewValueImporter {
+public class PutMessage extends PartitionMessageWithDirectReply implements NewValueImporter {
private static final Logger logger = LogService.getLogger();
/** The key associated with the value that must be sent */
@@ -437,15 +437,15 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
return e2;
}
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
- public final void setKey(Object key) {
+ public void setKey(Object key) {
this.key = key;
}
- public final byte[] getValBytes() {
+ public byte[] getValBytes() {
return this.valBytes;
}
@@ -468,16 +468,16 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
}
}
- public final Object getCallbackArg() {
+ public Object getCallbackArg() {
return this.cbArg;
}
- protected final Operation getOperation() {
+ protected Operation getOperation() {
return this.op;
}
@Override
- public final void setOperation(Operation operation) {
+ public void setOperation(Operation operation) {
this.op = operation;
}
@@ -509,7 +509,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
final int extraFlags = in.readUnsignedByte();
@@ -567,7 +567,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
* buff.append("; oldvalue object="+this.oldValObj); buff.toString(); return buff.toString(); }
*/
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
PartitionedRegion region = null;
try {
boolean flag = internalDs.getConfig().getDeltaPropagation();
@@ -675,7 +675,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
* indefinitely for the acknowledgement
*/
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
long startTime) throws EntryExistsException, DataLocationException, IOException {
this.setInternalDs(r.getSystem());// set the internal DS. Required to
// checked DS level delta-enabled property
@@ -823,7 +823,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
@Override
- protected final void appendFields(StringBuilder buff) {
+ protected void appendFields(StringBuilder buff) {
super.appendFields(buff);
buff.append("; key=").append(getKey()).append("; value=");
// buff.append(getValBytes());
@@ -864,11 +864,11 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
}
}
- public final InternalDistributedSystem getInternalDs() {
+ public InternalDistributedSystem getInternalDs() {
return internalDs;
}
- public final void setInternalDs(InternalDistributedSystem internalDs) {
+ public void setInternalDs(InternalDistributedSystem internalDs) {
this.internalDs = internalDs;
}
@@ -877,7 +877,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
return _mayAddToMultipleSerialGateways(dm);
}
- public static final class PutReplyMessage extends ReplyMessage implements OldValueImporter {
+ public static class PutReplyMessage extends ReplyMessage implements OldValueImporter {
/** Result of the Put operation */
boolean result;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
index b6028fe..bbd9d9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/QueryMessage.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.cache.query.Struct;
-public final class QueryMessage extends StreamingPartitionOperation.StreamingPartitionMessage {
+public class QueryMessage extends StreamingPartitionOperation.StreamingPartitionMessage {
private static final Logger logger = LogService.getLogger();
private volatile String queryString;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
index 8f4c65c..c473d2d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
@@ -515,7 +515,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
/**
* Profile information for a remote counterpart.
*/
- public static final class PartitionProfile extends CacheProfile {
+ public static class PartitionProfile extends CacheProfile {
/**
* The number of Mb the VM is allowed to use for the PR
@@ -568,7 +568,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
}
@Override
- protected final int getIntInfo() {
+ protected int getIntInfo() {
int s = super.getIntInfo();
if (this.requiresNotification)
s |= REQUIRES_NOTIFICATION_MASK;
@@ -576,7 +576,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
}
@Override
- protected final void setIntInfo(int s) {
+ protected void setIntInfo(int s) {
super.setIntInfo(s);
this.requiresNotification = (s & REQUIRES_NOTIFICATION_MASK) != 0;
}
@@ -598,7 +598,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
out.writeInt(this.shutDownAllStatus);
}
- // public final StoppableReentrantReadWriteLock.StoppableReadLock
+ // public StoppableReentrantReadWriteLock.StoppableReadLock
// getIsClosingReadLock(CancelCriterion stopper) {
// synchronized (this) {
// if (isClosingLock == null) {
@@ -608,7 +608,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
// return this.isClosingLock.readLock();
// }
- // public final Lock getIsClosingWriteLock() {
+ // public Lock getIsClosingWriteLock() {
// return this.isClosingLock.writeLock();
// }
@@ -1055,7 +1055,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
}
@Override
- final synchronized public boolean putProfile(Profile p) {
+ synchronized public boolean putProfile(Profile p) {
assert p instanceof CacheProfile;
CacheProfile profile = (CacheProfile) p;
PartitionedRegion pr = getPartitionedRegion();
@@ -1072,7 +1072,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
return super.putProfile(profile);
}
- final public PartitionProfile getPartitionProfile(InternalDistributedMember id) {
+ public PartitionProfile getPartitionProfile(InternalDistributedMember id) {
return (PartitionProfile) getProfile(id);
}
@@ -1209,7 +1209,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
* @param bucketId
* @return the Node managing the primary copy of the bucket
*/
- final public InternalDistributedMember getPrimaryMemberForBucket(int bucketId) {
+ public InternalDistributedMember getPrimaryMemberForBucket(int bucketId) {
Assert.assertTrue(this.buckets != null);
Bucket b = this.buckets[bucketId];
return b.getBucketAdvisor().getPrimary();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
index 6e4acff..fd0ebd4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoteSizeMessage.java
@@ -45,7 +45,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.0
*/
-public final class RemoteSizeMessage extends RemoteOperationMessage {
+public class RemoteSizeMessage extends RemoteOperationMessage {
private static final Logger logger = LogService.getLogger();
/** query type for Entries */
@@ -120,7 +120,7 @@ public final class RemoteSizeMessage extends RemoteOperationMessage {
* of the initialization
*/
@Override
- protected final boolean failIfRegionMissing() {
+ protected boolean failIfRegionMissing() {
return false;
}
@@ -179,7 +179,7 @@ public final class RemoteSizeMessage extends RemoteOperationMessage {
out.writeByte((byte) queryType);
}
- public static final class SizeReplyMessage extends ReplyMessage {
+ public static class SizeReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private int size;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
index 5f05e4b..7ee54d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -77,7 +77,7 @@ import org.apache.geode.internal.offheap.annotations.Retained;
*
* @since GemFire 8.1
*/
-public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
+public class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private RemoveAllEntryData[] removeAllPRData;
@@ -307,7 +307,7 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
* indefinitely for the acknowledgement
*/
@Override
- protected final boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
+ protected boolean operateOnPartitionedRegion(DistributionManager dm, PartitionedRegion r,
long startTime) throws EntryExistsException, ForceReattemptException, DataLocationException {
boolean sendReply = true;
@@ -358,7 +358,7 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
* @return If succeeds, return true, otherwise, throw exception
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "IMSE_DONT_CATCH_IMSE")
- public final boolean doLocalRemoveAll(PartitionedRegion r, InternalDistributedMember eventSender,
+ public boolean doLocalRemoveAll(PartitionedRegion r, InternalDistributedMember eventSender,
boolean cacheWrite)
throws EntryExistsException, ForceReattemptException, DataLocationException {
boolean didRemove = false;
@@ -647,15 +647,15 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
}
}
- public final InternalDistributedSystem getInternalDs() {
+ public InternalDistributedSystem getInternalDs() {
return internalDs;
}
- public final void setInternalDs(InternalDistributedSystem internalDs) {
+ public void setInternalDs(InternalDistributedSystem internalDs) {
this.internalDs = internalDs;
}
- public final void setDirectAck(boolean directAck) {
+ public void setDirectAck(boolean directAck) {
this.directAck = directAck;
}
@@ -664,7 +664,7 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply {
return _mayAddToMultipleSerialGateways(dm);
}
- public static final class RemoveAllReplyMessage extends ReplyMessage {
+ public static class RemoveAllReplyMessage extends ReplyMessage {
/** Result of the RemoveAll operation */
boolean result;
VersionedObjectList versions;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
index 6336841..a8ff068 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessage.java
@@ -139,7 +139,7 @@ public class RemoveBucketMessage extends PartitionMessage {
out.writeBoolean(this.forceRemovePrimary);
}
- public static final class RemoveBucketReplyMessage extends ReplyMessage {
+ public static class RemoveBucketReplyMessage extends ReplyMessage {
private boolean removed;
[48/69] [abbrv] geode git commit: GEODE-2804 Update InetSocketAddress,
when there is IOException.
Posted by ud...@apache.org.
GEODE-2804 Update InetSocketAddress, when there is IOException.
Geode keeps InetSocketAddress for locators. So, if locators ip
changes in cloud/VM enviroment then Geode process unable to
connect to locator. Thus we have fixed this problem in two way.
a. If Geode client sees IOException while connecting to locator then
we change cached InetAddress to use locator hostname. In this way,
client does DNS query again for locator host.
b. For other Geode process, now we connect to locator using hostname.
Added couple of junit tests for it.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e216fde1
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e216fde1
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e216fde1
Branch: refs/heads/feature/GEODE-2580
Commit: e216fde1e4b1613bde22112cfb1544be022c3aac
Parents: 90ee3d8
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Thu May 11 14:51:00 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Thu May 18 09:59:13 2017 -0700
----------------------------------------------------------------------
.../internal/AutoConnectionSourceImpl.java | 72 ++++++++++++++++++--
.../membership/gms/membership/GMSJoinLeave.java | 3 +-
.../internal/tcpserver/TcpClient.java | 27 +++++++-
.../internal/JmxManagerLocatorRequest.java | 5 +-
.../cli/commands/LauncherLifecycleCommands.java | 12 ++--
.../AutoConnectionSourceImplJUnitTest.java | 64 +++++++++++++++++
6 files changed, 167 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
index 53d401a..070451c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
@@ -204,12 +204,10 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
private ServerLocationResponse queryOneLocator(InetSocketAddress locator,
ServerLocationRequest request) {
- InetAddress addr = locator.getAddress();
- int port = locator.getPort();
Object returnObj = null;
try {
pool.getStats().incLocatorRequests();
- returnObj = tcpClient.requestToServer(addr, port, request, connectionTimeout);
+ returnObj = tcpClient.requestToServer(locator, request, connectionTimeout, true);
ServerLocationResponse response = (ServerLocationResponse) returnObj;
pool.getStats().incLocatorResponses();
if (response != null) {
@@ -218,6 +216,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
return response;
} catch (IOException ioe) {
reportDeadLocator(locator, ioe);
+ updateLocatorInLocatorList(locator);
return null;
} catch (ClassNotFoundException e) {
logger.warn(
@@ -234,6 +233,45 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
}
}
+ /**
+ * If connecting to the locator fails with an IOException, this may be because the locator's IP
+ * has changed. Add the locator back to the list of locators using host address rather than IP.
+ * This will cause another DNS lookup, hopefully finding the locator.
+ *
+ * @param locator
+ */
+ protected void updateLocatorInLocatorList(InetSocketAddress locator) {
+ if (locator.getHostName() != null) {
+ LocatorList locatorList = locators.get();
+ List<InetSocketAddress> newLocatorsList = new ArrayList<>();
+
+ for (InetSocketAddress tloc : locatorList.getLocators()) {
+ if (tloc.equals(locator)) {
+ /**
+ * This call doesn't throw UnknownHostException;
+ */
+ InetSocketAddress changeLoc =
+ new InetSocketAddress(locator.getHostName(), locator.getPort());
+ newLocatorsList.add(changeLoc);
+ logger.info("updateLocatorInLocatorList changing locator list: loc form: " + locator
+ + " ,loc to: " + changeLoc);
+ } else {
+ newLocatorsList.add(tloc);
+ }
+ }
+
+ logger.info("updateLocatorInLocatorList locator list from:" + locatorList.getLocators()
+ + " to: " + newLocatorsList);
+
+ LocatorList newLocatorList = new LocatorList(newLocatorsList);
+ locators.set(newLocatorList);
+ }
+ }
+
+ protected List<InetSocketAddress> getCurrentLocators() {
+ return locators.get().locators;
+ }
+
protected ServerLocationResponse queryLocators(ServerLocationRequest request) {
Iterator controllerItr = locators.get().iterator();
ServerLocationResponse response = null;
@@ -276,7 +314,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
badLocators.remove(address);
}
- newLocators.addAll(badLocators);
+ addbadLocators(newLocators, badLocators);
if (logger.isInfoEnabled()) {
LocatorList oldLocators = (LocatorList) locators.get();
@@ -300,11 +338,37 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
}
}
LocatorList newLocatorList = new LocatorList(newLocators);
+
locators.set(newLocatorList);
onlineLocators.set(new LocatorList(newOnlineLocators));
pool.getStats().setLocatorCount(newLocators.size());
}
+ /**
+ * This method will add bad locator only when locator with hostname and port is not already in
+ * list.
+ */
+ protected void addbadLocators(List<InetSocketAddress> newLocators,
+ Set<InetSocketAddress> badLocators) {
+ for (InetSocketAddress badLoc : badLocators) {
+ boolean addIt = true;
+ for (InetSocketAddress goodloc : newLocators) {
+ boolean isSameHost = badLoc.getHostName().equals(goodloc.getHostName());
+ if (isSameHost) {
+ boolean isSamePort = badLoc.getPort() == goodloc.getPort();
+ if (isSamePort) {
+ // ip has been changed so don't add this in current list
+ addIt = false;
+ break;
+ }
+ }
+ }
+ if (addIt) {
+ newLocators.add(badLoc);
+ }
+ }
+ }
+
public void start(InternalPool pool) {
this.pool = pool;
pool.getStats().setInitialContacts(((LocatorList) locators.get()).size());
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 4bf010b..9dc7fe2 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1143,8 +1143,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
FindCoordinatorRequest request, int connectTimeout)
throws ClassNotFoundException, IOException {
TcpClient client = new TcpClient();
- return client.requestToServer(addr.getAddress(), addr.getPort(), request, connectTimeout,
- true);
+ return client.requestToServer(addr.getAddress(), addr.getPort(), request, connectTimeout);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
index 6b54170..e9476b5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
@@ -134,6 +134,7 @@ public class TcpClient {
*/
public Object requestToServer(InetAddress addr, int port, Object request, int timeout)
throws IOException, ClassNotFoundException {
+
return requestToServer(addr, port, request, timeout, true);
}
@@ -146,7 +147,7 @@ public class TcpClient {
* @param timeout Timeout for sending the message and receiving a reply
* @param replyExpected Whether to wait for a reply
*
- * @return The reply, or null if no reply is expected
+ * @return the reply
*
* @throws IOException
* @throws ClassNotFoundException
@@ -157,8 +158,30 @@ public class TcpClient {
if (addr == null) {
ipAddr = new InetSocketAddress(port);
} else {
- ipAddr = new InetSocketAddress(addr, port); // fix for bug 30810
+ ipAddr = new InetSocketAddress(addr.getHostName(), port); // fix for bug 30810
}
+ return requestToServer(ipAddr, request, timeout, replyExpected);
+ }
+
+ /**
+ * Send a request to a Locator
+ *
+ * @param ipAddr The locator's inet socket address
+ * @param request The request message
+ * @param timeout Timeout for sending the message and receiving a reply
+ * @param replyExpected Whether to wait for a reply
+ *
+ * @return The reply, or null if no reply is expected
+ *
+ * @throws IOException
+ * @throws ClassNotFoundException
+ */
+ public Object requestToServer(InetSocketAddress ipAddr, Object request, int timeout,
+ boolean replyExpected) throws IOException, ClassNotFoundException {
+ /*
+ * InetSocketAddress ipAddr; if (addr == null) { ipAddr = new InetSocketAddress(port); } else {
+ * ipAddr = new InetSocketAddress(addr, port); // fix for bug 30810 }
+ */
long giveupTime = System.currentTimeMillis() + timeout;
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
index 0efba01..eb71d38 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerLocatorRequest.java
@@ -18,6 +18,7 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.util.Map;
import java.util.Properties;
@@ -71,6 +72,7 @@ public class JmxManagerLocatorRequest implements DataSerializableFixedID {
Map<String, String> sslConfigProps) throws IOException {
Properties distributionConfigProps = new Properties();
InetAddress networkAddress = InetAddress.getByName(locatorHost);
+ InetSocketAddress inetSockAddr = new InetSocketAddress(networkAddress, locatorPort);
try {
if (sslConfigProps != null) {
@@ -78,8 +80,7 @@ public class JmxManagerLocatorRequest implements DataSerializableFixedID {
}
TcpClient client = new TcpClient(new DistributionConfigImpl(distributionConfigProps));
- Object responseFromServer =
- client.requestToServer(networkAddress, locatorPort, SINGLETON, msTimeout);
+ Object responseFromServer = client.requestToServer(inetSockAddr, SINGLETON, msTimeout, true);
return (JmxManagerLocatorResponse) responseFromServer;
} catch (ClassNotFoundException unexpected) {
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index 0de41c0..7a2d33d 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -116,6 +116,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.UnknownHostException;
@@ -685,18 +686,17 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
try {
final InetAddress networkAddress = InetAddress.getByName(locatorHostName);
+ InetSocketAddress inetSockAddr = new InetSocketAddress(networkAddress, locatorPort);
TcpClient client = new TcpClient();
- SharedConfigurationStatusResponse statusResponse =
- (SharedConfigurationStatusResponse) client.requestToServer(networkAddress, locatorPort,
- new SharedConfigurationStatusRequest(), 10000, true);
+ SharedConfigurationStatusResponse statusResponse = (SharedConfigurationStatusResponse) client
+ .requestToServer(inetSockAddr, new SharedConfigurationStatusRequest(), 10000, true);
for (int i = 0; i < NUM_ATTEMPTS_FOR_SHARED_CONFIGURATION_STATUS; i++) {
if (statusResponse.getStatus().equals(SharedConfigurationStatus.STARTED)
|| statusResponse.getStatus().equals(SharedConfigurationStatus.NOT_STARTED)) {
- statusResponse =
- (SharedConfigurationStatusResponse) client.requestToServer(networkAddress,
- locatorPort, new SharedConfigurationStatusRequest(), 10000, true);
+ statusResponse = (SharedConfigurationStatusResponse) client.requestToServer(inetSockAddr,
+ new SharedConfigurationStatusRequest(), 10000, true);
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/e216fde1/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index da3cbdb..9ceb461 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -45,15 +45,20 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
+import junit.framework.Assert;
+
import java.io.IOException;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -141,6 +146,65 @@ public class AutoConnectionSourceImplJUnitTest {
}
}
+ /**
+ * This test validates the AutoConnectionSourceImpl.updateLocatorInLocatorList method. That method
+ * takes InetSocketAddres of locator which unable to connect to locator. And update that
+ * InetSocketAddres with hostaddress of locator in locatorlist.
+ *
+ * In this test we validate this using identityHashCode.
+ */
+ @Test
+ public void testLocatorIpChange() {
+ int port = 11011;
+ List<InetSocketAddress> locators = new ArrayList();
+ InetSocketAddress floc1 = new InetSocketAddress("fakeLocalHost1", port);
+ InetSocketAddress floc2 = new InetSocketAddress("fakeLocalHost2", port);
+ locators.add(floc1);
+ locators.add(floc2);
+ AutoConnectionSourceImpl src = new AutoConnectionSourceImpl(locators, "", 60 * 1000);
+
+ // This method will create a new InetSocketAddress of floc1
+ src.updateLocatorInLocatorList(floc1);
+
+ List<InetSocketAddress> cLocList = src.getCurrentLocators();
+
+ Assert.assertEquals(2, cLocList.size());
+
+ Iterator<InetSocketAddress> itr = cLocList.iterator();
+
+ while (itr.hasNext()) {
+ InetSocketAddress t = itr.next();
+ Assert.assertFalse("Should have replaced floc1 intsance", t == floc1);
+ }
+ }
+
+ /**
+ * This test validates the AutoConnectionSourceImpl.addbadLocators method. That method adds
+ * badLocator from badLocator list to new Locator list. And it make sure that new locator list
+ * doesn't have similar entry. For that it checks hostname and port only.
+ */
+ @Test
+ public void testAddBadLocator() {
+ int port = 11011;
+ List<InetSocketAddress> locators = new ArrayList();
+ InetSocketAddress floc1 = new InetSocketAddress("fakeLocalHost1", port);
+ InetSocketAddress floc2 = new InetSocketAddress("fakeLocalHost2", port);
+ locators.add(floc1);
+ locators.add(floc2);
+ AutoConnectionSourceImpl src = new AutoConnectionSourceImpl(locators, "", 60 * 1000);
+
+
+ Set<InetSocketAddress> badLocators = new HashSet<>();
+ InetSocketAddress b1 = new InetSocketAddress("fakeLocalHost1", port);
+ InetSocketAddress b2 = new InetSocketAddress("fakeLocalHost3", port);
+ badLocators.add(b1);
+ badLocators.add(b2);
+
+ src.addbadLocators(locators, badLocators);
+
+ Assert.assertEquals(3, locators.size());
+ }
+
@Test
public void testNoRespondingLocators() {
try {
[66/69] [abbrv] geode git commit: GEODE-2959: add pre-condition
assertion to LocatorLauncherTest
Posted by ud...@apache.org.
GEODE-2959: add pre-condition assertion to LocatorLauncherTest
* If this assertion fails then that means some other test that
ran previously to this one created and left a DistributedSystem
instance in existence. That other test needs to be found and
it requires a tearDown to close and null out that DS instance.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/64798a58
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/64798a58
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/64798a58
Branch: refs/heads/feature/GEODE-2580
Commit: 64798a583c881988c688cc64524ce027909f8f28
Parents: 97a6e1a
Author: Kirk Lund <kl...@apache.org>
Authored: Fri May 19 16:12:44 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri May 19 16:12:44 2017 -0700
----------------------------------------------------------------------
.../org/apache/geode/distributed/LocatorLauncherTest.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/64798a58/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
index 0281a37..d63da87 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -27,10 +27,12 @@ import static org.mockito.Mockito.when;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -61,6 +63,11 @@ public class LocatorLauncherTest {
@Rule
public final TestName testName = new TestName();
+ @Before
+ public void setUp() throws Exception {
+ assertThat(InternalDistributedSystem.getConnectedInstance()).isNull();
+ }
+
@Test
public void shouldBeMockable() throws Exception {
LocatorLauncher mockLocatorLauncher = mock(LocatorLauncher.class);
[36/69] [abbrv] geode git commit: GEODE-2915 Messages rejected due to
unknown "vmkind"
Posted by ud...@apache.org.
GEODE-2915 Messages rejected due to unknown "vmkind"
The fix for GEODE_2875 has exacerbated this problem, which we used to only
see in cases where disable-tcp=true or when multicast was enabled.
The problem is that JGroupsMessenger is not sending the "vmkind" of the
sender in message headers. This part of the header comes from
GMSMember.writeEssentialData(). I've changed it here to include the
vmKind if the recipient isn't using geode 1.0, which doesn't expect
the version byte.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/973eb33e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/973eb33e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/973eb33e
Branch: refs/heads/feature/GEODE-2580
Commit: 973eb33e20993331d192c2ba85d7c9d35f209bdf
Parents: a445853
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue May 16 13:45:49 2017 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue May 16 13:47:03 2017 -0700
----------------------------------------------------------------------
.../membership/InternalDistributedMember.java | 11 +
.../internal/membership/gms/GMSMember.java | 8 +-
.../gms/messenger/JGroupsMessenger.java | 3 +
.../gms/mgr/GMSMembershipManager.java | 28 +-
.../java/org/apache/geode/internal/Version.java | 49 +-
.../cache/tier/sockets/CommandInitializer.java | 11 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +-
.../configuration/domain/XmlEntity.java | 10 +-
.../membership/gms/GMSMemberJUnitTest.java | 47 +
.../test/dunit/standalone/ProcessManager.java | 2 +-
.../sanctionedDataSerializables.txt | 1074 +++++++++---------
geode-old-versions/build.gradle | 2 +-
12 files changed, 652 insertions(+), 595 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index b993b53..7170f20 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -165,6 +165,17 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
cachedToString = null;
}
+ /**
+ * Replace the current NetMember with the given member. This can be used to fill out an
+ * InternalDistributedMember that was created from a partial NetMember created by
+ * readEssentialData.
+ *
+ * @param m the replacement NetMember
+ */
+ public void setNetMember(NetMember m) {
+ this.netMbr = m;
+ }
+
// private void checkHostName() {
// // bug #44858: debug method to find who is putting a host name instead of addr into an ID
// if (!SocketCreator.resolve_dns
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index b7079f8..c82d97e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
@@ -20,6 +20,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.MemberAttributes;
import org.apache.geode.distributed.internal.membership.NetMember;
import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.jgroups.util.UUID;
@@ -460,7 +461,9 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
out.writeInt(vmViewId);
out.writeLong(uuidMSBs);
out.writeLong(uuidLSBs);
-
+ if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GEODE_120) >= 0) {
+ out.writeByte(vmKind);
+ }
}
@Override
@@ -487,6 +490,9 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
this.vmViewId = in.readInt();
this.uuidMSBs = in.readLong();
this.uuidLSBs = in.readLong();
+ if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GEODE_120) >= 0) {
+ this.vmKind = in.readByte();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index bfc8b61..b07aa59 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -990,6 +990,9 @@ public class JGroupsMessenger implements Messenger {
short ordinal = Version.readOrdinal(dis);
+ // logger.info("JGroupsMessenger read ordinal {} version is {}. My version is {}",
+ // ordinal, Version.fromOrdinalOrCurrent(ordinal), Version.CURRENT);
+
if (ordinal < Version.CURRENT_ORDINAL) {
dis = new VersionedDataInputStream(dis, Version.fromOrdinalNoThrow(ordinal, true));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 8cdd6a5..a41e08a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -472,17 +472,21 @@ public class GMSMembershipManager implements MembershipManager, Manager {
InternalDistributedMember m = newView.getMembers().get(i);
// Once a member has been seen via a view, remove them from the
- // newborn set
- boolean wasSurprise = surpriseMembers.remove(m) != null;
-
- // bug #45155 - membership view processing was slow, causing a member to connect as
- // "surprise"
- // and the surprise timeout removed the member and shunned it, keeping it from being
- // recognized as a valid member when it was finally seen in a view
- // if (isShunned(m)) {
- // warnShuns.add(m);
- // continue;
- // }
+ // newborn set. Replace the netmember of the surpriseMember ID
+ // in case it was a partial ID and is being retained by DistributionManager
+ // or some other object
+ boolean wasSurprise = surpriseMembers.containsKey(m);
+ if (wasSurprise) {
+ for (Iterator<Map.Entry<InternalDistributedMember, Long>> iterator =
+ surpriseMembers.entrySet().iterator(); iterator.hasNext();) {
+ Entry<InternalDistributedMember, Long> entry = iterator.next();
+ if (entry.getKey().equals(m)) {
+ entry.getKey().setNetMember(m.getNetMember());
+ iterator.remove();
+ break;
+ }
+ }
+ }
// if it's in a view, it's no longer suspect
suspectedMembers.remove(m);
@@ -491,7 +495,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
continue; // already seen
}
- // ARB: unblock any waiters for this particular member.
+ // unblock any waiters for this particular member.
// i.e. signal any waiting threads in tcpconduit.
String authInit =
this.services.getConfig().getDistributionConfig().getSecurityPeerAuthInit();
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index e058edb..1c131e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -59,7 +59,7 @@ public class Version implements Comparable<Version> {
/** byte used as ordinal to represent this <code>Version</code> */
private final short ordinal;
- public static final int HIGHEST_VERSION = 55;
+ public static final int HIGHEST_VERSION = 60;
private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
@@ -183,18 +183,23 @@ public class Version implements Comparable<Version> {
private static final byte GEODE_110_ORDINAL = 50;
public static final Version GEODE_110 =
- new Version("GEODE", "1.1.0", (byte) 9, (byte) 0, (byte) 1, (byte) 0, GEODE_110_ORDINAL);
+ new Version("GEODE", "1.1.0", (byte) 1, (byte) 1, (byte) 0, (byte) 0, GEODE_110_ORDINAL);
- private static final byte GFE_91_ORDINAL = 55;
+ private static final byte GEODE_111_ORDINAL = 55;
- public static final Version GFE_91 =
- new Version("GFE", "9.1", (byte) 9, (byte) 1, (byte) 0, (byte) 0, GFE_91_ORDINAL);
+ public static final Version GEODE_111 =
+ new Version("GEODE", "1.1.1", (byte) 1, (byte) 1, (byte) 1, (byte) 0, GEODE_111_ORDINAL);
+
+ private static final byte GEODE_120_ORDINAL = 60;
+
+ public static final Version GEODE_120 =
+ new Version("GEODE", "1.2.0", (byte) 1, (byte) 2, (byte) 0, (byte) 0, GEODE_120_ORDINAL);
/**
* This constant must be set to the most current version of the product. !!! NOTE: update
* HIGHEST_VERSION when changing CURRENT !!!
*/
- public static final Version CURRENT = GFE_91;
+ public static final Version CURRENT = GEODE_120;
/**
* A lot of versioning code needs access to the current version's ordinal
@@ -504,34 +509,10 @@ public class Version implements Comparable<Version> {
@Override
public int compareTo(Version other) {
if (other != null) {
- // [bruce] old implementation used ordinals for comparison, but this requires
- // ordinals to be in increasing order, which may not always be possible
- // // byte min/max can't overflow int, so use (a-b)
- // final int thisOrdinal = this.ordinal;
- // final int otherOrdinal = o.ordinal;
- // return (thisOrdinal - otherOrdinal);
- // [bruce] new implementation uses major/minor/patch/build
- if (this.majorVersion > other.majorVersion) {
- return 1;
- } else if (other.majorVersion > this.majorVersion) {
- return -1;
- }
- if (this.minorVersion > other.minorVersion) {
- return 1;
- } else if (other.minorVersion > this.minorVersion) {
- return -1;
- }
- if (this.release > other.release) {
- return 1;
- } else if (other.release > this.release) {
- return -1;
- }
- if (this.patch > other.patch) {
- return 1;
- } else if (other.patch > this.patch) {
- return -1;
- }
- return 0;
+ // byte min/max can't overflow int, so use (a-b)
+ final int thisOrdinal = this.ordinal;
+ final int otherOrdinal = other.ordinal;
+ return (thisOrdinal - otherOrdinal);
} else {
return 1;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 71586a0..9995e46 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -336,9 +336,14 @@ public class CommandInitializer {
ALL_COMMANDS.put(Version.GEODE_110, geode110Commands);
}
{
- Map<Integer, Command> gfe91Commands = new HashMap<Integer, Command>();
- gfe91Commands.putAll(ALL_COMMANDS.get(Version.GEODE_110));
- ALL_COMMANDS.put(Version.GFE_91, gfe91Commands);
+ Map<Integer, Command> geode111Commands = new HashMap<Integer, Command>();
+ geode111Commands.putAll(ALL_COMMANDS.get(Version.GEODE_110));
+ ALL_COMMANDS.put(Version.GEODE_111, geode111Commands);
+ }
+ {
+ Map<Integer, Command> commands = new HashMap<Integer, Command>();
+ commands.putAll(ALL_COMMANDS.get(Version.GEODE_111));
+ ALL_COMMANDS.put(Version.GEODE_120, commands);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 1b33094..2fb8c8d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -4222,7 +4222,7 @@ public class LocalizedStrings {
public static final StringId AbstractDistributionConfig_UNEXPECTED_PROBLEM_GETTING_INETADDRESS_0 =
new StringId(3548, "Unexpected problem getting inetAddress: {0}");
public static final StringId DistributionManager_UNKNOWN_MEMBER_TYPE_0 =
- new StringId(3549, "Unknown member type: {0}");
+ new StringId(3549, "Unknown member type: {0}");
public static final StringId DistributionManager_UNKNOWN_PROCESSOR_TYPE =
new StringId(3550, "unknown processor type {0}");
public static final StringId DLockRequestProcessor_UNKNOWN_RESPONSE_CODE_0 =
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index be74e84..0dbe7e5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -410,12 +410,12 @@ public class XmlEntity implements VersionedDataSerializable {
@Override
public void toData(DataOutput out) throws IOException {
- toDataPre_GFE_9_1_0_0(out);
+ toDataPre_GEODE_1_1_1_0(out);
DataSerializer.writeString(this.childPrefix, out);
DataSerializer.writeString(this.childNamespace, out);
}
- public void toDataPre_GFE_9_1_0_0(DataOutput out) throws IOException {
+ public void toDataPre_GEODE_1_1_1_0(DataOutput out) throws IOException {
DataSerializer.writeString(this.type, out);
DataSerializer.writeObject(this.attributes, out);
DataSerializer.writeString(this.xmlDefinition, out);
@@ -426,12 +426,12 @@ public class XmlEntity implements VersionedDataSerializable {
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- fromDataPre_GFE_9_1_0_0(in);
+ fromDataPre_GEODE_1_1_1_0(in);
this.childPrefix = DataSerializer.readString(in);
this.childNamespace = DataSerializer.readString(in);
}
- public void fromDataPre_GFE_9_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromDataPre_GEODE_1_1_1_0(DataInput in) throws IOException, ClassNotFoundException {
this.type = DataSerializer.readString(in);
this.attributes = DataSerializer.readObject(in);
this.xmlDefinition = DataSerializer.readString(in);
@@ -452,7 +452,7 @@ public class XmlEntity implements VersionedDataSerializable {
@Override
public Version[] getSerializationVersions() {
- return new Version[] {Version.GFE_91};
+ return new Version[] {Version.GEODE_111};
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index f471ad9..b5e4cfc 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -17,8 +17,17 @@ package org.apache.geode.distributed.internal.membership.gms;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
import java.net.InetAddress;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataInputStream;
import org.jgroups.util.UUID;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -177,4 +186,42 @@ public class GMSMemberJUnitTest {
member.setUUID(uuid);
assertNotNull(member.getUUID());
}
+
+ /**
+ * <p>
+ * GEODE-2875 - adds vmKind to on-wire form of GMSMember.writeEssentialData
+ * </p>
+ * <p>
+ * This must be backward-compatible with Geode 1.0 (Version.GFE_90)
+ * </p>
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testGMSMemberBackwardCompatibility() throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ MemberAttributes attributes = new MemberAttributes(10, 20, 1, 2, "member", null, null);
+ GMSMember member = new GMSMember();
+ member.setAttributes(attributes);
+ DataOutput dataOutput = new DataOutputStream(baos);
+ member.writeEssentialData(dataOutput);
+
+ // vmKind should be transmitted to a member with the current version
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ DataInput dataInput = new DataInputStream(bais);
+ GMSMember newMember = new GMSMember();
+ newMember.readEssentialData(dataInput);
+ assertEquals(1, newMember.getVmKind());
+
+ // vmKind should not be transmitted to a member with version GFE_90 or earlier
+ dataOutput = new HeapDataOutputStream(Version.GFE_90);
+ member.writeEssentialData(dataOutput);
+ bais = new ByteArrayInputStream(baos.toByteArray());
+ dataInput = new VersionedDataInputStream(new DataInputStream(bais), Version.GFE_90);
+ newMember = new GMSMember();
+ newMember.readEssentialData(dataInput);
+ assertEquals(0, newMember.getVmKind());
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/geode/blob/973eb33e/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
old mode 100644
new mode 100755
index 4e0e82f..21b79e8
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -76,7 +76,7 @@ public class ProcessManager {
workingDir.mkdirs();
} else if (!bouncedVM || DUnitLauncher.MAKE_NEW_WORKING_DIRS) {
try {
- Files.delete(workingDir.toPath());
+ FileUtils.deleteDirectory(workingDir);
} catch (IOException e) {
// This delete is occasionally failing on some platforms, maybe due to a lingering
// process. Allow the process to be launched anyway.
[25/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
index 5cde18e..21e755a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -61,6 +89,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -91,13 +120,19 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -113,7 +148,9 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -137,7 +174,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -148,19 +185,22 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -170,7 +210,9 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -195,7 +237,6 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -235,10 +276,14 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -248,7 +293,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -258,6 +303,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -266,7 +312,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -275,12 +321,12 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -293,14 +339,15 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -312,13 +359,20 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
index c42095c..95f48ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
@@ -15,40 +15,65 @@
package org.apache.geode.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 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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -67,9 +92,11 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -78,6 +105,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -108,13 +136,19 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -130,7 +164,9 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -154,7 +190,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -165,19 +201,22 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -187,7 +226,9 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -212,7 +253,6 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -252,10 +292,14 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -265,7 +309,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -275,6 +319,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -283,7 +328,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -292,12 +337,12 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -310,14 +355,15 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -329,8 +375,12 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -344,7 +394,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -363,6 +413,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -392,5 +443,8 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
index 515c555..2363dca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
@@ -15,40 +15,65 @@
package org.apache.geode.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 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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -79,9 +104,11 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -90,6 +117,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -120,13 +148,19 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -142,7 +176,9 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -166,7 +202,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -177,19 +213,22 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -199,7 +238,9 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -224,7 +265,6 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -264,10 +304,14 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -277,7 +321,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -287,6 +331,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -295,7 +340,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -304,12 +349,12 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -322,14 +367,15 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -341,8 +387,12 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -361,7 +411,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -391,6 +441,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -433,5 +484,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
index 214990e..e7e64a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -15,46 +15,76 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -62,6 +92,7 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -92,13 +123,19 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -114,7 +151,9 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -138,7 +177,7 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -149,19 +188,22 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -171,7 +213,9 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -196,7 +240,6 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -236,10 +279,14 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -249,7 +296,7 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -259,13 +306,14 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -274,12 +322,12 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -292,14 +340,15 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -311,13 +360,17 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -330,5 +383,8 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
index 4a3f0c9..a577c23 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java
@@ -15,39 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +83,11 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +107,7 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,117 +118,121 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -209,7 +242,7 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -219,13 +252,14 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -234,12 +268,12 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -252,14 +286,15 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -271,12 +306,18 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -287,5 +328,8 @@ public class VMStatsLRURegionEntryHeapIntKey extends VMStatsLRURegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
index 976e22e..893d565 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java
@@ -15,39 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +83,11 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +107,7 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,117 +118,121 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -209,7 +242,7 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -219,13 +252,14 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -234,12 +268,12 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -252,14 +286,15 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -271,12 +306,16 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -287,5 +326,8 @@ public class VMStatsLRURegionEntryHeapLongKey extends VMStatsLRURegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
index df6c10d..a0af97e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java
@@ -15,39 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +83,11 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +107,7 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,117 +118,121 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -209,7 +242,7 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -219,13 +252,14 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapObjectKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapObjectKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapObjectKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -234,12 +268,12 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -252,14 +286,15 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -271,13 +306,20 @@ public class VMStatsLRURegionEntryHeapObjectKey extends VMStatsLRURegionEntryHea
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
index 0cd82d7..902a0f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java
@@ -15,18 +15,26 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -34,17 +42,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHeap {
- public VMStatsLRURegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMStatsLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -63,9 +86,11 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -73,10 +98,11 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -96,7 +122,7 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -107,117 +133,121 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -227,7 +257,7 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -237,13 +267,14 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey1.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryHeapStringKey1> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryHeapStringKey1.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -252,12 +283,12 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -270,14 +301,15 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -289,8 +321,12 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -304,7 +340,7 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -323,6 +359,7 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -352,5 +389,8 @@ public class VMStatsLRURegionEntryHeapStringKey1 extends VMStatsLRURegionEntryHe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[58/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
GEODE-1994: Overhaul of internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
* geode.internal.lang.StringUtils has been deprecated. In the interim, it has been heavily refactored and extends commons.lang.StringUtils.
*
* Renamed:
* -- EMPTY_STRING -> EMPTY (inherited)
* -- toUpperCase -> upperCase (inherited)
* -- toLowerCase -> lowerCase (inherited)
* -- padEnding -> rightPad (inherited)
*
* Removed:
* -- EMPTY_STRING_ARRAY; usage replaced with commons.lang.ArrayUtils.EMPTY_STRING_ARRAY
* -- SPACES
* -- UTF_8; rare usage replaced with raw string
* -- concat; usage replaced with commons.lang.join, refactoring as necessary.
* -- getLettersOnly
* -- getSpaces
* -- truncate
* -- valueOf; usage refactored to use defaultString
*
* Refactored
* -- defaultIfBlank: previously relied on varargs and could return null. Usage refactored to allow inheritance from commons.
* -- defaultString(s, EMPTY) refactored to use standard signature defaultString(s) for consistency throughout codebase.
* -- isBlank: usage refactored to resolve discrepancies with commons.lang.isBlank, which is now inherited.
* -- isEmpty: usage refactored to resolve discrepancies with commons.lang.isEmpty, which is now inherited.
*
* Code Cleanup:
* -- Many uses of !isBlank -> isNotBlank
* -- Changes suggested by Inspections on most touched files.
* -- Explicit <T> -> <> when type is inferable
* -- while loops operating on iterators converted to for each loops
* -- for loops operating on array indices converted to for each loops
* -- Various string typos corrected.
* -- isEmpty(s.trim()) -> isBlank(s)
* -- s.trim().isEmpty() -> isEmpty(s)
* -- Removed some instances of 'dead' code
* -- Optimized imports in every touched file
*
* Qualitative Changes:
* -- The following functions now throw an error when called with a null string input:
* -- * LocatorLauncher.Builder.setMemberName
* -- * ServerLauncher.Builder.setMemberName
* -- * ServerLauncher.Builder.setHostnameForClients
* -- (Unit tests added to capture these changes)
*
* Notes:
* -- StringUtils.wraps may be inherited from Apache Commons when the dependency is updated.
* -- AbstractLauncher.getMember has the documented behavior of returning null when both MemberName and ID are blank. Is this the best behavior for this method?
* this closes #521
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d16d192b
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d16d192b
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d16d192b
Branch: refs/heads/feature/GEODE-2580
Commit: d16d192b22f2932ac95780f18e92f0aece730240
Parents: 9af854a
Author: Patrick Rhomberg <pr...@pivotal.io>
Authored: Wed May 17 16:57:07 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri May 19 10:29:16 2017 -0700
----------------------------------------------------------------------
.../LauncherLifecycleCommandsDUnitTest.java | 77 ++--
.../commands/LauncherLifecycleCommandsTest.java | 61 +--
.../web/controllers/RestAPITestBase.java | 54 +--
.../internal/locator/LocatorStatusResponse.java | 32 +-
.../query/internal/AttributeDescriptor.java | 70 +---
.../cache/query/internal/NWayMergeResults.java | 31 +-
.../geode/distributed/AbstractLauncher.java | 27 +-
.../geode/distributed/LocatorLauncher.java | 58 ++-
.../geode/distributed/ServerLauncher.java | 72 ++--
.../internal/ClusterConfigurationService.java | 64 ++--
.../distributed/internal/InternalLocator.java | 46 +--
.../membership/gms/membership/GMSJoinLeave.java | 67 ++--
.../geode/internal/InternalDataSerializer.java | 134 +++----
.../admin/remote/RemoteTransportConfig.java | 25 +-
.../cache/ClusterConfigurationLoader.java | 47 ++-
.../geode/internal/cache/EntryEventImpl.java | 20 +-
.../internal/cache/tier/sockets/HandShake.java | 85 ++---
.../apache/geode/internal/lang/StringUtils.java | 268 ++-----------
.../apache/geode/internal/lang/SystemUtils.java | 4 +-
.../internal/process/FileProcessController.java | 11 +-
.../geode/internal/process/signal/Signal.java | 4 +-
.../security/IntegratedSecurityService.java | 10 +-
.../apache/geode/internal/util/ArrayUtils.java | 11 +-
.../org/apache/geode/internal/util/IOUtils.java | 6 +-
.../geode/management/internal/AgentUtil.java | 8 +-
.../geode/management/internal/JettyHelper.java | 27 +-
.../management/internal/ManagementAgent.java | 60 ++-
.../geode/management/internal/RestAgent.java | 21 +-
.../geode/management/internal/SSLUtil.java | 5 +-
.../internal/beans/DistributedSystemBridge.java | 175 ++++-----
.../internal/beans/DistributedSystemMBean.java | 11 +-
.../internal/beans/ManagementAdapter.java | 82 ++--
.../internal/beans/QueryDataFunction.java | 90 ++---
.../geode/management/internal/cli/CliUtil.java | 48 +--
.../cli/commands/AbstractCommandsSupport.java | 15 +-
.../internal/cli/commands/ConfigCommands.java | 40 +-
.../CreateAlterDestroyRegionCommands.java | 187 ++++------
...xportImportClusterConfigurationCommands.java | 34 +-
.../internal/cli/commands/IndexCommands.java | 25 +-
.../cli/commands/LauncherLifecycleCommands.java | 372 +++++++------------
.../internal/cli/commands/ShellCommands.java | 10 +-
.../cli/converters/FilePathStringConverter.java | 2 +-
.../converters/GatewaySenderIdConverter.java | 15 +-
.../internal/cli/domain/DiskStoreDetails.java | 10 +-
.../internal/cli/domain/IndexDetails.java | 14 +-
.../functions/DescribeDiskStoreFunction.java | 13 +-
.../FetchSharedConfigurationStatusFunction.java | 2 +-
.../cli/functions/RegionCreateFunction.java | 11 +-
.../management/internal/cli/help/HelpBlock.java | 4 +-
.../management/internal/cli/help/Helper.java | 4 +-
.../internal/cli/result/ResultBuilder.java | 18 +-
.../internal/cli/result/TableBuilder.java | 30 +-
.../internal/cli/shell/GfshConfig.java | 6 +-
.../cli/shell/GfshExecutionStrategy.java | 16 +-
.../internal/cli/shell/JmxOperationInvoker.java | 4 +-
.../internal/cli/util/CommandStringBuilder.java | 4 +-
.../configuration/domain/XmlEntity.java | 50 ++-
.../messages/ConfigurationRequest.java | 12 +-
.../messages/ConfigurationResponse.java | 22 +-
.../internal/configuration/utils/XmlUtils.java | 33 +-
.../controllers/AbstractCommandsController.java | 62 ++--
.../controllers/ConfigCommandsController.java | 10 +-
.../web/controllers/DataCommandsController.java | 4 +-
.../controllers/DeployCommandsController.java | 13 +-
.../DiskStoreCommandsController.java | 16 +-
.../DurableClientCommandsController.java | 14 +-
.../web/controllers/ExportLogController.java | 2 +-
.../controllers/FunctionCommandsController.java | 10 +-
.../MiscellaneousCommandsController.java | 4 +-
.../web/controllers/PdxCommandsController.java | 9 +-
.../controllers/QueueCommandsController.java | 7 +-
.../controllers/RegionCommandsController.java | 11 +-
.../controllers/ShellCommandsController.java | 34 +-
.../web/controllers/WanCommandsController.java | 55 ++-
.../management/internal/web/domain/Link.java | 12 +-
.../internal/web/domain/LinkIndex.java | 6 +-
.../internal/web/http/HttpHeader.java | 4 +-
.../web/shell/RestHttpOperationInvoker.java | 4 +-
.../internal/web/util/ConvertUtils.java | 11 +-
.../management/internal/web/util/UriUtils.java | 4 +-
.../cache/client/internal/LocatorTestBase.java | 40 +-
.../AbstractLauncherIntegrationTestCase.java | 2 +-
.../geode/distributed/AbstractLauncherTest.java | 24 +-
.../LocatorLauncherIntegrationTest.java | 14 +-
.../geode/distributed/LocatorLauncherTest.java | 61 ++-
.../ServerLauncherIntegrationTest.java | 14 +-
.../geode/distributed/ServerLauncherTest.java | 40 +-
.../internal/lang/ClassUtilsJUnitTest.java | 15 +-
.../internal/lang/StringUtilsJUnitTest.java | 244 +-----------
.../internal/util/CollectionUtilsJUnitTest.java | 96 ++---
.../AbstractCommandsSupportJUnitTest.java | 40 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 45 ++-
.../internal/configuration/ClusterConfig.java | 14 +-
.../dunit/rules/GfshShellConnectionRule.java | 2 +-
.../internal/cli/LuceneIndexCommands.java | 45 +--
.../functions/LuceneCreateIndexFunction.java | 3 +-
.../cli/LuceneIndexCommandsJUnitTest.java | 61 +--
.../pulse/testbed/PropMockDataUpdater.java | 17 +-
.../geodefunctions/RetrieveRegionFunction.java | 20 +-
.../internal/web/AbstractWebTestCase.java | 14 +-
.../ShellCommandsControllerJUnitTest.java | 38 +-
.../RestHttpOperationInvokerJUnitTest.java | 40 +-
102 files changed, 1648 insertions(+), 2297 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 5277e57..27bc098 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -14,41 +14,13 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Wait.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.nio.charset.Charset;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.TimeUnit;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
@@ -79,6 +51,37 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.TimeUnit;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
/**
* The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the
@@ -389,7 +392,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertTrue(resultString,
resultString
.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
- StringUtils.EMPTY_STRING, gemfirePropertiesPathname)));
+ StringUtils.EMPTY, gemfirePropertiesPathname)));
}
/**
@@ -525,7 +528,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertTrue(resultString,
resultString
.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
- StringUtils.EMPTY_STRING, gemfirePropertiesFile)));
+ StringUtils.EMPTY, gemfirePropertiesFile)));
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsTest.java
index 0554f69..2a1662e 100755
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsTest.java
@@ -14,33 +14,42 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-
-import org.apache.geode.distributed.LocatorLauncher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.GemFireException;
import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.ServerLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.DistributionLocator;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
/**
* The LauncherLifecycleCommandsTest class is a test suite of test cases testing the contract and
@@ -77,7 +86,7 @@ public class LauncherLifecycleCommandsTest {
assertTrue(commandLine.isEmpty());
- getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine, StringUtils.EMPTY_STRING);
+ getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine, StringUtils.EMPTY);
assertTrue(commandLine.isEmpty());
@@ -106,7 +115,7 @@ public class LauncherLifecycleCommandsTest {
gemfireProperties.setProperty(LOCATORS, "localhost[11235]");
gemfireProperties.setProperty(LOG_LEVEL, "config");
- gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING);
+ gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY);
gemfireProperties.setProperty(MCAST_PORT, "0");
gemfireProperties.setProperty(NAME, "machine");
@@ -144,7 +153,7 @@ public class LauncherLifecycleCommandsTest {
gemfireProperties.setProperty(LOCATORS, "localhost[11235]");
gemfireProperties.setProperty(LOG_LEVEL, "config");
- gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING);
+ gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY);
gemfireProperties.setProperty(MCAST_PORT, "0");
gemfireProperties.setProperty(NAME, "machine");
@@ -182,7 +191,7 @@ public class LauncherLifecycleCommandsTest {
assertTrue(commandLine.isEmpty());
- getLauncherLifecycleCommands().addInitialHeap(commandLine, StringUtils.EMPTY_STRING);
+ getLauncherLifecycleCommands().addInitialHeap(commandLine, StringUtils.EMPTY);
assertTrue(commandLine.isEmpty());
@@ -255,7 +264,7 @@ public class LauncherLifecycleCommandsTest {
assertTrue(commandLine.isEmpty());
- getLauncherLifecycleCommands().addMaxHeap(commandLine, StringUtils.EMPTY_STRING);
+ getLauncherLifecycleCommands().addMaxHeap(commandLine, StringUtils.EMPTY);
assertTrue(commandLine.isEmpty());
@@ -621,11 +630,11 @@ public class LauncherLifecycleCommandsTest {
}
private String toClasspath(final String... jarFilePathnames) {
- String classpath = StringUtils.EMPTY_STRING;
+ String classpath = StringUtils.EMPTY;
if (jarFilePathnames != null) {
for (final String jarFilePathname : jarFilePathnames) {
- classpath += (classpath.isEmpty() ? StringUtils.EMPTY_STRING : File.pathSeparator);
+ classpath += (classpath.isEmpty() ? StringUtils.EMPTY : File.pathSeparator);
classpath += jarFilePathname;
}
}
@@ -637,7 +646,7 @@ public class LauncherLifecycleCommandsTest {
String path = "";
for (Object pathElement : pathElements) {
- path += (path.isEmpty() ? StringUtils.EMPTY_STRING : File.pathSeparator);
+ path += (path.isEmpty() ? StringUtils.EMPTY : File.pathSeparator);
path += pathElement;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index f2e90a4..4529f2c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -14,36 +14,21 @@
*/
package org.apache.geode.rest.internal.web.controllers;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.json.JSONArray;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.fail;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.AgentUtil;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.Host;
@@ -51,6 +36,25 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.JSONArray;
+import org.junit.experimental.categories.Category;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
@Category(DistributedTest.class)
class RestAPITestBase extends JUnit4DistributedTestCase {
@@ -168,7 +172,7 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
HttpPost post = new HttpPost(restString);
post.addHeader("Content-Type", "application/json");
post.addHeader("Accept", "application/json");
- if (jsonBody != null && !StringUtils.isEmpty(jsonBody)) {
+ if (StringUtils.isNotEmpty(jsonBody)) {
StringEntity jsonStringEntity = new StringEntity(jsonBody, ContentType.DEFAULT_TEXT);
post.setEntity(jsonStringEntity);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
index d531cc1..677db4d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponse.java
@@ -15,6 +15,13 @@
package org.apache.geode.cache.client.internal.locator;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.process.PidUnavailableException;
+import org.apache.geode.internal.process.ProcessUtils;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -24,13 +31,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.process.PidUnavailableException;
-import org.apache.geode.internal.process.ProcessUtils;
-
/**
* The LocatorStatusResponse class...
* </p>
@@ -101,7 +101,7 @@ public class LocatorStatusResponse extends ServerLocationResponse {
@SuppressWarnings("unchecked")
public List<String> getJvmArgs() {
return Collections
- .unmodifiableList(ObjectUtils.defaultIfNull(jvmArgs, Collections.<String>emptyList()));
+ .unmodifiableList(ObjectUtils.defaultIfNull(jvmArgs, Collections.emptyList()));
}
public Integer getPid() {
@@ -162,12 +162,12 @@ public class LocatorStatusResponse extends ServerLocationResponse {
}
protected void readWorkingDirectory(final DataInput in) throws IOException {
- this.workingDirectory = StringUtils.defaultIfBlank(in.readUTF());
+ this.workingDirectory = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readJvmArguments(final DataInput in) throws IOException {
final int length = in.readInt();
- final List<String> jvmArgs = new ArrayList<String>(length);
+ final List<String> jvmArgs = new ArrayList<>(length);
for (int index = 0; index < length; index++) {
jvmArgs.add(in.readUTF());
}
@@ -175,23 +175,23 @@ public class LocatorStatusResponse extends ServerLocationResponse {
}
protected void readClasspath(final DataInput in) throws IOException {
- this.classpath = StringUtils.defaultIfBlank(in.readUTF());
+ this.classpath = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readGemFireVersion(final DataInput in) throws IOException {
- this.gemfireVersion = StringUtils.defaultIfBlank(in.readUTF());
+ this.gemfireVersion = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readJavaVersion(final DataInput in) throws IOException {
- this.javaVersion = StringUtils.defaultIfBlank(in.readUTF());
+ this.javaVersion = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readLogFile(final DataInput in) throws IOException {
- this.logFile = StringUtils.defaultIfBlank(in.readUTF());
+ this.logFile = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readHost(final DataInput in) throws IOException {
- this.host = StringUtils.defaultIfBlank(in.readUTF());
+ this.host = StringUtils.nullifyIfBlank(in.readUTF());
}
protected void readPort(final DataInput in) throws IOException {
@@ -200,7 +200,7 @@ public class LocatorStatusResponse extends ServerLocationResponse {
}
protected void readName(final DataInput in) throws IOException {
- this.name = StringUtils.defaultIfBlank(in.readUTF());
+ this.name = StringUtils.nullifyIfBlank(in.readUTF());
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
index f40ab3e..5bfba0e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
@@ -15,6 +15,19 @@
package org.apache.geode.cache.query.internal;
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.query.NameNotFoundException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxSerializationException;
+import org.apache.geode.pdx.internal.FieldNotFoundInPdxVersion;
+import org.apache.geode.pdx.internal.PdxInstanceImpl;
+
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -28,19 +41,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.geode.cache.EntryDestroyedException;
-import org.apache.geode.cache.query.NameNotFoundException;
-import org.apache.geode.cache.query.QueryInvocationTargetException;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.internal.cache.Token;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.pdx.PdxSerializationException;
-import org.apache.geode.pdx.internal.FieldNotFoundInPdxVersion;
-import org.apache.geode.pdx.internal.PdxInstanceImpl;
-import org.apache.geode.pdx.JSONFormatter;
-
/**
* Utility for managing an attribute
*
@@ -137,25 +137,6 @@ public class AttributeDescriptor {
}
- /* this method is not yet used. Here to support Update statements */
- // returns either null or UNDEFINED
- /*
- * public Object write(Object target, Object newValue) throws PathEvaluationException { if (target
- * == null) return QueryService.UNDEFINED;
- *
- *
- * Class targetType = target.getClass(); Class argType = newValue == null ? null :
- * newValue.getClass(); Member m = getWriteMember(targetType, argType); if (m == null) throw new
- * PathEvaluationException(LocalizedStrings.AttributeDescriptor_NO_UPDATE_PATH_MAPPING_FOUND_FOR_0
- * .toLocalizedString(_name)); try { if (m instanceof Method) { try { ((Method)m).invoke(target,
- * new Object[] { newValue }); return null; } catch (InvocationTargetException e) { throw new
- * PathEvaluationException(e.getTargetException()); } } else { ((Field)m).set(target, newValue);
- * return null; } } catch (IllegalAccessException e) { throw new PathEvaluationException(e)); }
- *
- * }
- */
-
-
Member getReadMember(ObjectType targetType) throws NameNotFoundException {
return getReadMember(targetType.resolveClass());
}
@@ -186,14 +167,6 @@ public class AttributeDescriptor {
}
- /*
- * Not yet used, Here to support Update statements private Member getWriteMember(Class targetType,
- * Class argType) { // mapping: public field (same name), method (setAttribute(val)), // method
- * attribute(val) Member m; m = getWriteField(targetType, argType); if (m != null) return m;
- * return getWriteMethod(targetType, argType); }
- */
-
-
private Field getReadField(Class targetType) {
try {
@@ -203,11 +176,6 @@ public class AttributeDescriptor {
}
}
- /*
- * not yet used private Field getWriteField(Class targetType, Class argType) { try { return
- * targetType.getField(_name); } catch (NoSuchFieldException e) { return null; } }
- */
-
private Method getReadMethod(Class targetType) {
@@ -219,12 +187,6 @@ public class AttributeDescriptor {
return getReadMethod(targetType, _name);
}
- /*
- * not yet used private Method getWriteMethod(Class targetType, Class argType) { Method m; String
- * beanMethod = "set" + _name.substring(0,1).toUpperCase() + _name.substring(1); m =
- * getWriteMethod(targetType, argType, beanMethod); if (m != null) return m; return
- * getWriteMethod(targetType, argType, _name); }
- */
private Method getReadMethod(Class targetType, String methodName) {
@@ -236,12 +198,6 @@ public class AttributeDescriptor {
}
}
- /*
- * not yet used private Method getWriteMethod(Class targetType, Class argType, String methodName)
- * { try { // @todo look up maximally specific method based on argType return
- * targetType.getMethod(methodName, new Class[] { argType }); } catch (NoSuchMethodException e) {
- * return null; } }
- */
/**
* reads field value from a PdxInstance
*
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
index 4e52a67..1a267d8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/NWayMergeResults.java
@@ -14,19 +14,6 @@
*/
package org.apache.geode.cache.query.internal;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.AbstractCollection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
@@ -40,6 +27,19 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.HeapDataOutputStream.LongUpdater;
import org.apache.geode.internal.Version;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
/**
* The n - way merge results returns a sorted results on the cumulative sorted results for
* partitioned region based query
@@ -210,11 +210,6 @@ public class NWayMergeResults<E> implements SelectResults<E>, Ordered, DataSeria
}
- /*
- * @Override public boolean isEmpty() { boolean isEmpty = true; for (SelectResults<E> result :
- * this.sortedResults) { isEmpty = result.isEmpty(); if (!isEmpty) { break; } } return isEmpty;
- * }
- */
@Override
public Iterator<E> iterator() {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
index feba893..007a990 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java
@@ -37,14 +37,11 @@ import org.apache.geode.management.internal.cli.json.GfJsonObject;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.net.BindException;
import java.net.InetAddress;
import java.net.URL;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -144,7 +141,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
* @see java.util.Properties
*/
protected static boolean isSet(final Properties properties, final String propertyName) {
- return !StringUtils.isBlank(properties.getProperty(propertyName));
+ return StringUtils.isNotBlank(properties.getProperty(propertyName));
}
/**
@@ -243,7 +240,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
distributedSystemProperties.putAll(defaults);
}
- if (!StringUtils.isBlank(getMemberName())) {
+ if (StringUtils.isNotBlank(getMemberName())) {
distributedSystemProperties.setProperty(NAME, getMemberName());
}
@@ -291,7 +288,13 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
* @see #getMemberId()
*/
public String getMember() {
- return StringUtils.defaultIfBlank(getMemberName(), getMemberId());
+ if (StringUtils.isNotBlank(getMemberName())) {
+ return getMemberName();
+ }
+ if (StringUtils.isNotBlank(getMemberId())) {
+ return getMemberId();
+ }
+ return null;
}
/**
@@ -501,7 +504,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
// TODO refactor the logic in this method into a DateTimeFormatUtils class
protected static String toDaysHoursMinutesSeconds(final Long milliseconds) {
- final StringBuilder buffer = new StringBuilder(StringUtils.EMPTY_STRING);
+ final StringBuilder buffer = new StringBuilder();
if (milliseconds != null) {
long millisecondsRemaining = milliseconds;
@@ -569,7 +572,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
* @return a String value containing the JSON representation of this state object.
*/
public String toJson() {
- final Map<String, Object> map = new HashMap<String, Object>();
+ final Map<String, Object> map = new HashMap<>();
map.put(JSON_CLASSPATH, getClasspath());
map.put(JSON_GEMFIREVERSION, getGemFireVersion());
map.put(JSON_HOST, getHost());
@@ -778,12 +781,12 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
// the value of a Number as a String, or "" if null
protected String toString(final Number value) {
- return StringUtils.valueOf(value, "");
+ return StringUtils.defaultString(value);
}
// a String concatenation of all values separated by " "
protected String toString(final Object... values) {
- return StringUtils.concat(values, " ");
+ return values == null ? "" : StringUtils.join(values, " ");
}
// the value of the String, or "" if value is null
@@ -805,8 +808,8 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna
private final String description;
Status(final String description) {
- assert !StringUtils.isBlank(description) : "The Status description must be specified!";
- this.description = StringUtils.toLowerCase(description);
+ assert StringUtils.isNotBlank(description) : "The Status description must be specified!";
+ this.description = StringUtils.lowerCase(description);
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index 641e009..68aa9db 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -15,32 +15,42 @@
package org.apache.geode.distributed;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import org.apache.geode.cache.client.internal.locator.*;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.distributed.internal.tcpserver.*;
+import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.internal.DistributionLocator;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
-import org.apache.geode.internal.process.*;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.process.ConnectionFailedException;
+import org.apache.geode.internal.process.ControlNotificationHandler;
+import org.apache.geode.internal.process.ControllableProcess;
+import org.apache.geode.internal.process.FileAlreadyExistsException;
+import org.apache.geode.internal.process.MBeanInvocationFailedException;
+import org.apache.geode.internal.process.PidUnavailableException;
+import org.apache.geode.internal.process.ProcessController;
+import org.apache.geode.internal.process.ProcessControllerFactory;
+import org.apache.geode.internal.process.ProcessControllerParameters;
+import org.apache.geode.internal.process.ProcessLauncherContext;
+import org.apache.geode.internal.process.ProcessType;
+import org.apache.geode.internal.process.ProcessUtils;
+import org.apache.geode.internal.process.StartupStatusListener;
+import org.apache.geode.internal.process.UnableToControlProcessException;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.lang.AttachAPINotFoundException;
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import joptsimple.OptionException;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -48,12 +58,23 @@ import java.lang.management.ManagementFactory;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
/**
* The LocatorLauncher class is a launcher for a GemFire Locator.
@@ -1563,7 +1584,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
* @see #getHostnameForClients()
*/
public Builder setHostnameForClients(final String hostnameForClients) {
- if (StringUtils.isEmpty(StringUtils.trim(hostnameForClients))) {
+ if (StringUtils.isBlank(hostnameForClients)) {
throw new IllegalArgumentException(
LocalizedStrings.LocatorLauncher_Builder_INVALID_HOSTNAME_FOR_CLIENTS_ERROR_MESSAGE
.toLocalizedString());
@@ -1591,7 +1612,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
* @see #getMemberName()
*/
public Builder setMemberName(final String memberName) {
- if (StringUtils.isEmpty(StringUtils.trim(memberName))) {
+ if (StringUtils.isBlank(memberName)) {
throw new IllegalArgumentException(
LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE
.toLocalizedString("Locator"));
@@ -1707,7 +1728,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
}
boolean isWorkingDirectorySpecified() {
- return !StringUtils.isBlank(this.workingDirectory);
+ return StringUtils.isNotBlank(this.workingDirectory);
}
/**
@@ -1931,7 +1952,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
* option.
*/
public boolean hasOption(final String option) {
- return getOptions().contains(StringUtils.toLowerCase(option));
+ return getOptions().contains(StringUtils.lowerCase(option));
}
/**
@@ -2043,8 +2064,9 @@ public class LocatorLauncher extends AbstractLauncher<String> {
if (logFile != null && logFile.isFile()) {
final String logFileCanonicalPath =
IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
- if (!StringUtils.isBlank(logFileCanonicalPath)) { // this is probably not need but a safe
- // check none-the-less.
+ if (StringUtils.isNotBlank(logFileCanonicalPath)) { // this is probably not need but a
+ // safe
+ // check none-the-less.
return logFileCanonicalPath;
}
}
@@ -2056,7 +2078,7 @@ public class LocatorLauncher extends AbstractLauncher<String> {
if (InternalLocator.hasLocator()) {
final InternalLocator locator = InternalLocator.getLocator();
final String portAsString = String.valueOf(locator.getPort());
- if (!StringUtils.isBlank(portAsString)) {
+ if (StringUtils.isNotBlank(portAsString)) {
return portAsString;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
index b2d0151..acd5e8a 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
@@ -15,33 +15,9 @@
package org.apache.geode.distributed;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import joptsimple.OptionException;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.distributed.ConfigurationProperties.SERVER_BIND_ADDRESS;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
@@ -87,6 +63,30 @@ import org.apache.geode.pdx.PdxSerializer;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+
/**
* The ServerLauncher class is a launcher class with main method to start a GemFire Server (implying
* a GemFire Cache Server process).
@@ -366,7 +366,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
final StringBuilder buffer = new StringBuilder(ServerState.getServerBindAddressAsString(this));
final String serverPort = ServerState.getServerPortAsString(this);
- if (!StringUtils.isBlank(serverPort)) {
+ if (StringUtils.isNotBlank(serverPort)) {
buffer.append("[").append(serverPort).append("]");
}
@@ -590,7 +590,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* configuration meta-data.
*/
public boolean isSpringXmlLocationSpecified() {
- return !StringUtils.isBlank(this.springXmlLocation);
+ return StringUtils.isNotBlank(this.springXmlLocation);
}
/**
@@ -1956,7 +1956,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* @see #getMemberName()
*/
public Builder setMemberName(final String memberName) {
- if (StringUtils.isEmpty(StringUtils.trim(memberName))) {
+ if (StringUtils.isBlank(memberName)) {
throw new IllegalArgumentException(
LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE
.toLocalizedString("Server"));
@@ -2496,7 +2496,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
private final String name;
Command(final String name, final String... options) {
- assert !StringUtils.isBlank(name) : "The name of the command must be specified!";
+ assert StringUtils.isNotBlank(name) : "The name of the command must be specified!";
this.name = name;
this.options = (options != null ? Collections.unmodifiableList(Arrays.asList(options))
: Collections.<String>emptyList());
@@ -2572,7 +2572,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
* option.
*/
public boolean hasOption(final String option) {
- return getOptions().contains(StringUtils.toLowerCase(option));
+ return getOptions().contains(StringUtils.lowerCase(option));
}
/**
@@ -2678,7 +2678,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
if (logFile != null && logFile.isFile()) {
final String logFileCanonicalPath =
IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
- if (!StringUtils.isBlank(logFileCanonicalPath)) {
+ if (StringUtils.isNotBlank(logFileCanonicalPath)) {
return logFileCanonicalPath;
}
}
@@ -2696,7 +2696,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
if (csList != null && !csList.isEmpty()) {
final CacheServer cs = csList.get(0);
final String serverBindAddressAsString = cs.getBindAddress();
- if (!StringUtils.isBlank(serverBindAddressAsString)) {
+ if (StringUtils.isNotBlank(serverBindAddressAsString)) {
return serverBindAddressAsString;
}
}
@@ -2714,13 +2714,13 @@ public class ServerLauncher extends AbstractLauncher<String> {
if (csList != null && !csList.isEmpty()) {
final CacheServer cs = csList.get(0);
final String portAsString = String.valueOf(cs.getPort());
- if (!StringUtils.isBlank(portAsString)) {
+ if (StringUtils.isNotBlank(portAsString)) {
return portAsString;
}
}
}
- return (launcher.isDisableDefaultServer() ? StringUtils.EMPTY_STRING
+ return (launcher.isDisableDefaultServer() ? StringUtils.EMPTY
: launcher.getServerPortAsString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
index 10623b4..d990015 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterConfigurationService.java
@@ -14,41 +14,14 @@
*/
package org.apache.geode.distributed.internal;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.logging.log4j.Logger;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.CancelException;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheLoaderException;
@@ -69,7 +42,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.configuration.callbacks.ConfigurationChangeListener;
@@ -81,6 +53,34 @@ import org.apache.geode.management.internal.configuration.messages.Configuration
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusResponse;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
@SuppressWarnings({"deprecation", "unchecked"})
public class ClusterConfigurationService {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
index ad5e04d..6500385 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
@@ -14,26 +14,11 @@
*/
package org.apache.geode.distributed.internal;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.logging.log4j.Logger;
+import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.CancelException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.GemFireCache;
@@ -69,7 +54,6 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
-import org.apache.geode.internal.logging.log4j.LogWriterLogger;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.management.internal.JmxManagerLocator;
@@ -81,6 +65,22 @@ import org.apache.geode.management.internal.configuration.handlers.SharedConfigu
import org.apache.geode.management.internal.configuration.messages.ConfigurationRequest;
import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusRequest;
import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusResponse;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* Provides the implementation of a distribution {@code Locator} as well as internal-only
@@ -675,7 +675,7 @@ public class InternalLocator extends Locator implements ConnectListener {
// this.logger.config("ensuring that this locator is in the locators list");
boolean setLocatorsProp = false;
String locatorsProp = this.config.getLocators();
- if (locatorsProp != null && !locatorsProp.trim().isEmpty()) {
+ if (StringUtils.isNotBlank(locatorsProp)) {
if (!locatorsProp.contains(thisLocator)) {
locatorsProp = locatorsProp + ',' + thisLocator;
setLocatorsProp = true;
@@ -756,7 +756,7 @@ public class InternalLocator extends Locator implements ConnectListener {
*
* @since GemFire 5.7
*/
- void endStartLocator(InternalDistributedSystem distributedSystem) throws UnknownHostException {
+ void endStartLocator(InternalDistributedSystem distributedSystem) {
this.env = null;
if (distributedSystem == null) {
distributedSystem = InternalDistributedSystem.getConnectedInstance();
@@ -1262,7 +1262,7 @@ public class InternalLocator extends Locator implements ConnectListener {
public Object processRequest(Object request) throws IOException {
long giveup = 0;
while (giveup == 0 || System.currentTimeMillis() < giveup) {
- TcpHandler handler = null;
+ TcpHandler handler;
if (request instanceof PeerLocatorRequest) {
handler = this.handlerMapping.get(PeerLocatorRequest.class);
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 9dc7fe2..478c4e8 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -14,33 +14,20 @@
*/
package org.apache.geode.distributed.internal.membership.gms.membership;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.distributed.internal.membership.gms.ServiceConfig.*;
-import static org.apache.geode.internal.DataSerializableFixedID.*;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TimerTask;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.logging.log4j.Logger;
-
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.apache.geode.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL;
+import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_REQ;
+import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_RESP;
+import static org.apache.geode.internal.DataSerializableFixedID.INSTALL_VIEW_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.JOIN_REQUEST;
+import static org.apache.geode.internal.DataSerializableFixedID.JOIN_RESPONSE;
+import static org.apache.geode.internal.DataSerializableFixedID.LEAVE_REQUEST_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.NETWORK_PARTITION_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.REMOVE_MEMBER_REQUEST;
+import static org.apache.geode.internal.DataSerializableFixedID.VIEW_ACK_MESSAGE;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.SystemConnectException;
import org.apache.geode.distributed.DistributedMember;
@@ -72,6 +59,28 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TimerTask;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* GMSJoinLeave handles membership communication with other processes in the distributed system. It
@@ -1627,8 +1636,8 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
this.services = s;
DistributionConfig dc = services.getConfig().getDistributionConfig();
- if (dc.getMcastPort() != 0 && dc.getLocators().trim().isEmpty()
- && dc.getStartLocator().trim().isEmpty()) {
+ if (dc.getMcastPort() != 0 && StringUtils.isBlank(dc.getLocators())
+ && StringUtils.isBlank(dc.getStartLocator())) {
throw new GemFireConfigException("Multicast cannot be configured for a non-distributed cache."
+ " Please configure the locator services for this cache using " + LOCATORS + " or "
+ START_LOCATOR + ".");
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 78b2944..019c35c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -14,56 +14,7 @@
*/
package org.apache.geode.internal;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.NotSerializableException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.io.UTFDataFormatException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.CancelException;
import org.apache.geode.CanonicalInstantiator;
import org.apache.geode.DataSerializable;
@@ -115,6 +66,55 @@ import org.apache.geode.pdx.internal.PdxReaderImpl;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PdxWriterImpl;
import org.apache.geode.pdx.internal.TypeRegistry;
+import org.apache.logging.log4j.Logger;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.NotSerializableException;
+import java.io.ObjectInput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.io.UTFDataFormatException;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
/**
* Contains static methods for data serializing instances of internal GemFire classes. It also
@@ -879,8 +879,8 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
// send it to cache servers if it is a client
sendRegistrationMessageToServers(s);
}
- // send it to all cache clients irelevent of distribute
- // bridge servers send it all the clients irelevent of
+ // send it to all cache clients irrelevant of distribute
+ // bridge servers send it all the clients irrelevant of
// originator VM
sendRegistrationMessageToClients(s);
@@ -918,7 +918,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
private static void register(String className, boolean distribute,
SerializerAttributesHolder holder) {
- if (className == null || className.trim().isEmpty()) {
+ if (StringUtils.isBlank(className)) {
throw new IllegalArgumentException("Class name cannot be null or empty.");
}
@@ -1062,9 +1062,9 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
if (o instanceof DataSerializer) {
DataSerializer s = (DataSerializer) o;
Class[] classes = s.getSupportedClasses();
- for (int i = 0; i < classes.length; i++) {
- classesToSerializers.remove(classes[i].getName(), s);
- supportedClassesToHolders.remove(classes[i].getName());
+ for (Class aClass : classes) {
+ classesToSerializers.remove(aClass.getName(), s);
+ supportedClassesToHolders.remove(aClass.getName());
}
dsClassesToHolders.remove(s.getClass().getName());
idsToHolders.remove(idx);
@@ -1185,7 +1185,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
SerializerAttributesHolder holder = entry.getValue();
try {
Class cl = getCachedClass(name);
- DataSerializer ds = null;
+ DataSerializer ds;
if (holder.getEventId() != null) {
ds = register(cl, false, holder.getEventId(), holder.getProxyId());
} else {
@@ -1404,13 +1404,13 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
}
try {
invokeToData(o, out);
- } catch (IOException io) {
+ } catch (IOException | CancelException | ToDataException | GemFireRethrowable io) {
// Note: this is not a user code toData but one from our
// internal code since only GemFire product code implements DSFID
- throw io;
- } catch (CancelException | ToDataException | GemFireRethrowable ex) {
+
// Serializing a PDX can result in a cache closed exception. Just rethrow
- throw ex;
+
+ throw io;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
// If this ever returns, rethrow the error. We're poisoned
@@ -1726,7 +1726,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
final int size = readArrayLength(in);
if (size >= 0) {
for (int index = 0; index < size; ++index) {
- E element = DataSerializer.<E>readObject(in);
+ E element = DataSerializer.readObject(in);
c.add(element);
}
@@ -2582,7 +2582,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
}
}
- public static int readDSFIDHeader(final DataInput in) throws IOException, ClassNotFoundException {
+ public static int readDSFIDHeader(final DataInput in) throws IOException {
checkIn(in);
byte header = in.readByte();
if (header == DS_FIXED_ID_BYTE) {
@@ -2666,11 +2666,11 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
throws IOException, ClassNotFoundException {
boolean wouldReadSerialized = PdxInstanceImpl.getPdxReadSerialized();
if (!wouldReadSerialized) {
- return DataSerializer.<T>readObject(in);
+ return DataSerializer.readObject(in);
} else {
PdxInstanceImpl.setPdxReadSerialized(false);
try {
- return DataSerializer.<T>readObject(in);
+ return DataSerializer.readObject(in);
} finally {
PdxInstanceImpl.setPdxReadSerialized(true);
}
@@ -2878,7 +2878,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
}
private static Object readUserDataSerializable(final DataInput in, int classId)
- throws IOException, ClassNotFoundException {
+ throws IOException {
Instantiator instantiator = InternalInstantiator.getInstantiator(classId);
if (instantiator == null) {
logger.error(LogMarker.SERIALIZER,
@@ -3698,7 +3698,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
synchronized (cacheAccessLock) {
Class<?> cachedClass = getExistingCachedClass(className);
if (cachedClass == null) {
- classCache.put(className, new WeakReference<Class<?>>(result));
+ classCache.put(className, new WeakReference<>(result));
} else {
result = cachedClass;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
index af3cb5d..1dc2fd1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteTransportConfig.java
@@ -14,7 +14,21 @@
*/
package org.apache.geode.internal.admin.remote;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBERSHIP_PORT_RANGE;
+import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.admin.TransportConfig;
+import org.apache.geode.internal.i18n.LocalizedStrings;
import java.util.Collection;
import java.util.Collections;
@@ -24,13 +38,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.admin.TransportConfig;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.lang.StringUtils;
-
/**
* Tranport config for RemoteGfManagerAgent.
*/
@@ -99,7 +106,7 @@ public class RemoteTransportConfig implements TransportConfig {
StringTokenizer stringTokenizer = new StringTokenizer(initialHosts, ",");
while (stringTokenizer.hasMoreTokens()) {
String locator = stringTokenizer.nextToken();
- if (!StringUtils.isEmpty(locator)) {
+ if (StringUtils.isNotEmpty(locator)) {
locators.add(new DistributionLocatorId(locator));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
index 55e3542..37f2120 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
@@ -17,41 +17,40 @@ package org.apache.geode.internal.cache;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Stream;
-
import org.apache.commons.lang.ArrayUtils;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.UnmodifiableException;
import org.apache.geode.cache.Cache;
-import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
+import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.ConfigSource;
import org.apache.geode.internal.DeployedJar;
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.process.ClusterConfigurationNotAvailableException;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.management.internal.configuration.messages.ConfigurationRequest;
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
+import org.apache.logging.log4j.Logger;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+import java.util.stream.Stream;
public class ClusterConfigurationLoader {
@@ -121,7 +120,7 @@ public class ClusterConfigurationLoader {
requestedConfiguration.get(ClusterConfigurationService.CLUSTER_CONFIG);
if (clusterConfiguration != null) {
String cacheXmlContent = clusterConfiguration.getCacheXmlContent();
- if (!StringUtils.isBlank(cacheXmlContent)) {
+ if (StringUtils.isNotBlank(cacheXmlContent)) {
cacheXmlContentList.add(cacheXmlContent);
}
}
@@ -131,7 +130,7 @@ public class ClusterConfigurationLoader {
Configuration groupConfiguration = requestedConfiguration.get(group);
if (groupConfiguration != null) {
String cacheXmlContent = groupConfiguration.getCacheXmlContent();
- if (!StringUtils.isBlank(cacheXmlContent)) {
+ if (StringUtils.isNotBlank(cacheXmlContent)) {
cacheXmlContentList.add(cacheXmlContent);
}
}
@@ -230,7 +229,7 @@ public class ClusterConfigurationLoader {
String ipaddress = dlId.getBindAddress();
InetAddress locatorInetAddress = null;
- if (!StringUtils.isBlank(ipaddress)) {
+ if (StringUtils.isNotBlank(ipaddress)) {
locatorInetAddress = InetAddress.getByName(ipaddress);
} else {
locatorInetAddress = dlId.getHost();
@@ -265,7 +264,7 @@ public class ClusterConfigurationLoader {
private static List<String> getGroups(DistributionConfig config) {
String groupString = config.getGroups();
List<String> groups = new ArrayList<String>();
- if (!StringUtils.isBlank(groupString)) {
+ if (StringUtils.isNotBlank(groupString)) {
groups.addAll((Arrays.asList(groupString.split(","))));
}
return groups;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/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 185fde7..69684a3 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
@@ -14,16 +14,8 @@
*/
package org.apache.geode.internal.cache;
-import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.function.Function;
-
-import org.apache.logging.log4j.Logger;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
+import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE;
import org.apache.geode.CopyHelper;
import org.apache.geode.DataSerializer;
@@ -83,6 +75,14 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
+import org.apache.logging.log4j.Logger;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.function.Function;
/**
* Implementation of an entry event
[61/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
new file mode 100644
index 0000000..1f99dac
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class NonLocalRegionEntryTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ NonLocalRegionEntry mockNonLocalRegionEntry = mock(NonLocalRegionEntry.class);
+ RegionEntryContext mockRegionEntryContext = mock(RegionEntryContext.class);
+ LocalRegion mockLocalRegion = mock(LocalRegion.class);
+ Object valueInVM = new Object();
+ Object valueOnDisk = new Object();
+
+ when(mockNonLocalRegionEntry.getValueInVM(eq(mockRegionEntryContext))).thenReturn(valueInVM);
+ when(mockNonLocalRegionEntry.getValueInVMOrDiskWithoutFaultIn(eq(mockLocalRegion)))
+ .thenReturn(valueOnDisk);
+
+ assertThat(mockNonLocalRegionEntry.getValueInVM(mockRegionEntryContext)).isSameAs(valueInVM);
+ assertThat(mockNonLocalRegionEntry.getValueInVMOrDiskWithoutFaultIn(mockLocalRegion))
+ .isSameAs(valueOnDisk);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index ed23f2a..1e56d00 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -487,7 +487,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
* <p>
* Added specifically to test scenario of defect #47181.
*/
- private final Cache createLonerCacheWithEnforceUniqueHost() {
+ private Cache createLonerCacheWithEnforceUniqueHost() {
Cache myCache = null;
try {
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE",
@@ -519,7 +519,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest
* <p>
* Added specifically to test scenario of defect #47181.
*/
- private final InternalDistributedSystem getLonerSystemWithEnforceUniqueHost() {
+ private InternalDistributedSystem getLonerSystemWithEnforceUniqueHost() {
Properties props = getDistributedSystemProperties();
props.put(MCAST_PORT, "0");
props.put(LOCATORS, "");
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
new file mode 100644
index 0000000..a638b14
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class PlaceHolderDiskRegionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ PlaceHolderDiskRegion mockPlaceHolderDiskRegion = mock(PlaceHolderDiskRegion.class);
+ when(mockPlaceHolderDiskRegion.getName()).thenReturn("NAME");
+ assertThat(mockPlaceHolderDiskRegion.getName()).isEqualTo("NAME");
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
new file mode 100644
index 0000000..115a1d9
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ProxyBucketRegionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ProxyBucketRegion mockProxyBucketRegion = mock(ProxyBucketRegion.class);
+ BucketAdvisor mockBucketAdvisor = mock(BucketAdvisor.class);
+
+ when(mockProxyBucketRegion.getBucketAdvisor()).thenReturn(mockBucketAdvisor);
+
+ assertThat(mockProxyBucketRegion.getBucketAdvisor()).isSameAs(mockBucketAdvisor);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
new file mode 100644
index 0000000..f02da45
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteFetchEntryMessageTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RemoteFetchEntryMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RemoteFetchEntryMessage mockRemoteFetchEntryMessage = mock(RemoteFetchEntryMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ LocalRegion mockLocalRegion = mock(LocalRegion.class);
+ long startTime = System.currentTimeMillis();
+
+ when(mockRemoteFetchEntryMessage.operateOnRegion(eq(mockDistributionManager),
+ eq(mockLocalRegion), eq(startTime))).thenReturn(true);
+
+ assertThat(mockRemoteFetchEntryMessage.operateOnRegion(mockDistributionManager, mockLocalRegion,
+ startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
new file mode 100644
index 0000000..29c5a78
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemotePutAllMessageTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.DataInput;
+
+@Category(UnitTest.class)
+public class RemotePutAllMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RemotePutAllMessage mockRemotePutAllMessage = mock(RemotePutAllMessage.class);
+ DataInput mockDataInput = mock(DataInput.class);
+
+ mockRemotePutAllMessage.fromData(mockDataInput);
+
+ verify(mockRemotePutAllMessage, times(1)).fromData(mockDataInput);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
new file mode 100644
index 0000000..1205c9a
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteRemoveAllMessageTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.DataInput;
+
+@Category(UnitTest.class)
+public class RemoteRemoveAllMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RemoteRemoveAllMessage mockRemoteRemoveAllMessage = mock(RemoteRemoveAllMessage.class);
+ DataInput mockDataInput = mock(DataInput.class);
+
+ mockRemoteRemoveAllMessage.fromData(mockDataInput);
+
+ verify(mockRemoteRemoveAllMessage, times(1)).fromData(mockDataInput);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
new file mode 100644
index 0000000..96c312f
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RequestFilterInfoMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RequestFilterInfoMessage mockRequestFilterInfoMessage = mock(RequestFilterInfoMessage.class);
+ when(mockRequestFilterInfoMessage.getProcessorType()).thenReturn(1);
+ assertThat(mockRequestFilterInfoMessage.getProcessorType()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
new file mode 100644
index 0000000..11f633a
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RequestImageMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RequestImageMessage mockRequestImageMessage = mock(RequestImageMessage.class);
+ when(mockRequestImageMessage.getProcessorType()).thenReturn(1);
+ assertThat(mockRequestImageMessage.getProcessorType()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
new file mode 100644
index 0000000..8355e5c
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RequestRVVMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RequestRVVMessage mockRequestRVVMessage = mock(RequestRVVMessage.class);
+ when(mockRequestRVVMessage.getProcessorType()).thenReturn(1);
+ assertThat(mockRequestRVVMessage.getProcessorType()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
new file mode 100644
index 0000000..761064f
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class StateMarkerMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ StateMarkerMessage mockStateMarkerMessage = mock(StateMarkerMessage.class);
+ when(mockStateMarkerMessage.getProcessorType()).thenReturn(1);
+ assertThat(mockStateMarkerMessage.getProcessorType()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
new file mode 100644
index 0000000..052d174
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class TXEventTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ TXEvent mockTXEvent = mock(TXEvent.class);
+ Cache mockCache = mock(Cache.class);
+ when(mockTXEvent.getCache()).thenReturn(mockCache);
+ assertThat(mockTXEvent.getCache()).isSameAs(mockCache);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
new file mode 100644
index 0000000..76c1e79
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class TXMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ TXMessage mockTXMessage = mock(TXMessage.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+ when(mockTXMessage.getMemberToMasqueradeAs()).thenReturn(mockInternalDistributedMember);
+ assertThat(mockTXMessage.getMemberToMasqueradeAs()).isSameAs(mockInternalDistributedMember);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
new file mode 100644
index 0000000..6c5a349
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.tx.TXRegionStub;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class TXStateStubTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ TXStateStub mockTXStateStub = mock(TXStateStub.class);
+ TXRegionStub mockTXRegionStub = mock(TXRegionStub.class);
+ LocalRegion mockLocalRegion = mock(LocalRegion.class);
+ when(mockTXStateStub.getTXRegionStub(eq(mockLocalRegion))).thenReturn(mockTXRegionStub);
+ assertThat(mockTXStateStub.getTXRegionStub(mockLocalRegion)).isSameAs(mockTXRegionStub);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java b/geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java
index f6558c0..77f3867 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java
@@ -32,7 +32,7 @@ import java.util.zip.ZipInputStream;
*/
public class UnzipUtil {
- public static final void unzip(InputStream input, String targetDir) throws IOException {
+ public static void unzip(InputStream input, String targetDir) throws IOException {
File dir = new File(targetDir);
if (!dir.exists() && !dir.mkdir()) {
@@ -62,7 +62,7 @@ public class UnzipUtil {
zipInput.close();
}
- public static final void copyInputStream(InputStream in, OutputStream out) throws IOException {
+ public static void copyInputStream(InputStream in, OutputStream out) throws IOException {
byte[] buffer = new byte[1024];
int len;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
new file mode 100644
index 0000000..324c121
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.control;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ResourceAdvisorTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ResourceAdvisor mockResourceAdvisor = mock(ResourceAdvisor.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+ when(mockResourceAdvisor.isHeapCritical(eq((mockInternalDistributedMember)))).thenReturn(true);
+ assertThat(mockResourceAdvisor.isHeapCritical(mockInternalDistributedMember)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
index 438d938..915cddf 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ConflatableObject.java
@@ -121,70 +121,70 @@ public class ConflatableObject implements Conflatable, Serializable {
/**
* @return Returns the conflate.
*/
- final boolean isConflate() {
+ boolean isConflate() {
return conflate;
}
/**
* @param conflate The conflate to set.
*/
- final void setConflate(boolean conflate) {
+ void setConflate(boolean conflate) {
this.conflate = conflate;
}
/**
* @return Returns the id.
*/
- final EventID getId() {
+ EventID getId() {
return id;
}
/**
* @param id The id to set.
*/
- final void setId(EventID id) {
+ void setId(EventID id) {
this.id = id;
}
/**
* @return Returns the key.
*/
- final Object getKey() {
+ Object getKey() {
return key;
}
/**
* @param key The key to set.
*/
- final void setKey(Object key) {
+ void setKey(Object key) {
this.key = key;
}
/**
* @return Returns the regionname.
*/
- final String getRegionname() {
+ String getRegionname() {
return regionname;
}
/**
* @param regionname The regionname to set.
*/
- final void setRegionname(String regionname) {
+ void setRegionname(String regionname) {
this.regionname = regionname;
}
/**
* @return Returns the value.
*/
- final Object getValue() {
+ Object getValue() {
return value;
}
/**
* @param value The value to set.
*/
- final void setValue(Object value) {
+ void setValue(Object value) {
this.value = value;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
new file mode 100644
index 0000000..3341083
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/lru/LRUAlgorithmTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.lru;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class LRUAlgorithmTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ LRUAlgorithm mockLRUAlgorithm = mock(LRUAlgorithm.class);
+ EnableLRU mockEnableLRU = mock(EnableLRU.class);
+ when(mockLRUAlgorithm.getLRUHelper()).thenReturn(mockEnableLRU);
+ assertThat(mockLRUAlgorithm.getLRUHelper()).isEqualTo(mockEnableLRU);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
new file mode 100644
index 0000000..9dd1cd8
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class BucketBackupMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ BucketBackupMessage mockBucketBackupMessage = mock(BucketBackupMessage.class);
+ when(mockBucketBackupMessage.failIfRegionMissing()).thenReturn(true);
+ assertThat(mockBucketBackupMessage.failIfRegionMissing()).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
index b95e11a..c5fea71 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
@@ -15,43 +15,26 @@
package org.apache.geode.internal.cache.partitioned;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class ColocatedRegionDetailsJUnitTest {
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {}
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {}
-
- /**
- * Test method for
- * {@link org.apache.geode.internal.cache.partitioned.ColocatedRegionDetails#ColocatedRegionDetails(java.lang.String, java.lang.String, java.lang.String, java.lang.String)}.
- */
@Test
- public final void testColocatedRegionDetailsConstructor() {
+ public void testColocatedRegionDetailsConstructor() {
ColocatedRegionDetails crd =
new ColocatedRegionDetails("host", "member name", "parent region", "child region");
assertNotNull(crd);
@@ -61,12 +44,8 @@ public class ColocatedRegionDetailsJUnitTest {
assertEquals("child region", crd.getChild());
}
- /**
- * Test method for
- * {@link org.apache.geode.internal.cache.partitioned.ColocatedRegionDetails#ColocatedRegionDetails()}.
- */
@Test
- public final void testColocatedRegion0ArgConstructor() {
+ public void testColocatedRegion0ArgConstructor() {
ColocatedRegionDetails crd = new ColocatedRegionDetails();
assertNotNull(crd);
assertNull(crd.getHost());
@@ -77,7 +56,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testContructingWithNulls() {
+ public void testConstructingWithNulls() {
ColocatedRegionDetails crd1 =
new ColocatedRegionDetails(null, "member name", "parent region", "child region");
ColocatedRegionDetails crd2 =
@@ -93,15 +72,8 @@ public class ColocatedRegionDetailsJUnitTest {
assertNotNull(crd4);
}
- /**
- * Test method for
- * {@link org.apache.geode.internal.cache.partitioned.ColocatedRegionDetails#toData(java.io.DataOutput)}.
- *
- * @throws IOException
- * @throws ClassNotFoundException
- */
@Test
- public final void testSerialization() throws IOException, ClassNotFoundException {
+ public void testSerialization() throws Exception {
ColocatedRegionDetails crd =
new ColocatedRegionDetails("host", "member name", "parent region", "child region");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -114,8 +86,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testSerializationOfEmptyColocatedRegionDetails()
- throws IOException, ClassNotFoundException {
+ public void testSerializationOfEmptyColocatedRegionDetails() throws Exception {
ColocatedRegionDetails crd = new ColocatedRegionDetails();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DataOutput out = new DataOutputStream(baos);
@@ -127,7 +98,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testHostNotEquals() {
+ public void testHostNotEquals() {
ColocatedRegionDetails crd1 = new ColocatedRegionDetails();
ColocatedRegionDetails crd2 =
new ColocatedRegionDetails("host1", "member name", "parent region", "child region");
@@ -139,7 +110,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testMemberNotEquals() {
+ public void testMemberNotEquals() {
ColocatedRegionDetails crd1 =
new ColocatedRegionDetails("host", null, "parent region", "child region");
ColocatedRegionDetails crd2 =
@@ -152,7 +123,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testParentNotEquals() {
+ public void testParentNotEquals() {
ColocatedRegionDetails crd1 =
new ColocatedRegionDetails("host", "member1", null, "child region");
ColocatedRegionDetails crd2 =
@@ -165,7 +136,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testChildNotEquals() {
+ public void testChildNotEquals() {
ColocatedRegionDetails crd1 =
new ColocatedRegionDetails("host", "member1", "parent region", null);
ColocatedRegionDetails crd2 =
@@ -178,7 +149,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testClassInequality() {
+ public void testClassInequality() {
ColocatedRegionDetails crd1 =
new ColocatedRegionDetails("host", "member1", "parent region", null);
String crd2 = crd1.toString();
@@ -187,7 +158,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void nullColocatedRegionDetailsEqualsTests() {
+ public void nullColocatedRegionDetailsEqualsTests() {
ColocatedRegionDetails crd1 = null;
ColocatedRegionDetails crd2 =
new ColocatedRegionDetails("host", "member1", "parent region", "child1");
@@ -198,7 +169,7 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testToString() {
+ public void testToString() {
ColocatedRegionDetails crd =
new ColocatedRegionDetails("host1", "member name", "parent region", "child region");
assertEquals("[host:host1, member:member name, parent:parent region, child:child region]",
@@ -206,13 +177,13 @@ public class ColocatedRegionDetailsJUnitTest {
}
@Test
- public final void testToStringOfEmptyColocatedRegionDetails() {
+ public void testToStringOfEmptyColocatedRegionDetails() {
ColocatedRegionDetails crd = new ColocatedRegionDetails();
assertEquals("[,,,]", crd.toString());
}
@Test
- public final void testHashCode() {
+ public void testHashCode() {
ColocatedRegionDetails crd1 = new ColocatedRegionDetails();
ColocatedRegionDetails crd2 =
new ColocatedRegionDetails("host1", "member name", "parent region", "child region");
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
new file mode 100644
index 0000000..f1847f4
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DeposePrimaryBucketMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DeposePrimaryBucketMessage mockDeposePrimaryBucketMessage =
+ mock(DeposePrimaryBucketMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ PartitionedRegion mockPartitionedRegion = mock(PartitionedRegion.class);
+ long startTime = System.currentTimeMillis();
+ when(mockDeposePrimaryBucketMessage.operateOnPartitionedRegion(eq(mockDistributionManager),
+ eq(mockPartitionedRegion), eq(startTime))).thenReturn(true);
+ assertThat(mockDeposePrimaryBucketMessage.operateOnPartitionedRegion(mockDistributionManager,
+ mockPartitionedRegion, startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
new file mode 100644
index 0000000..4cf44e4
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class FetchEntryMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ FetchEntryMessage mockFetchEntryMessage = mock(FetchEntryMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ PartitionedRegion mockPartitionedRegion = mock(PartitionedRegion.class);
+ long startTime = System.currentTimeMillis();
+ Object key = new Object();
+
+ when(mockFetchEntryMessage.operateOnPartitionedRegion(eq(mockDistributionManager),
+ eq(mockPartitionedRegion), eq(startTime))).thenReturn(true);
+
+ mockFetchEntryMessage.setKey(key);
+
+ verify(mockFetchEntryMessage, times(1)).setKey(key);
+
+ assertThat(mockFetchEntryMessage.operateOnPartitionedRegion(mockDistributionManager,
+ mockPartitionedRegion, startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
new file mode 100644
index 0000000..921017a
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class FetchPartitionDetailsMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ FetchPartitionDetailsMessage mockFetchPartitionDetailsMessage =
+ mock(FetchPartitionDetailsMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ PartitionedRegion mockPartitionedRegion = mock(PartitionedRegion.class);
+ long startTime = System.currentTimeMillis();
+ Object key = new Object();
+
+ when(mockFetchPartitionDetailsMessage.operateOnPartitionedRegion(eq(mockDistributionManager),
+ eq(mockPartitionedRegion), eq(startTime))).thenReturn(true);
+
+ assertThat(mockFetchPartitionDetailsMessage.operateOnPartitionedRegion(mockDistributionManager,
+ mockPartitionedRegion, startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
new file mode 100644
index 0000000..2c37cc8
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class MoveBucketMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ MoveBucketMessage mockMoveBucketMessage = mock(MoveBucketMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ PartitionedRegion mockPartitionedRegion = mock(PartitionedRegion.class);
+ long startTime = System.currentTimeMillis();
+ Object key = new Object();
+
+ when(mockMoveBucketMessage.operateOnPartitionedRegion(eq(mockDistributionManager),
+ eq(mockPartitionedRegion), eq(startTime))).thenReturn(true);
+
+ assertThat(mockMoveBucketMessage.operateOnPartitionedRegion(mockDistributionManager,
+ mockPartitionedRegion, startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
index b3bb02b..01099d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
@@ -14,18 +14,17 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.mockito.internal.stubbing.answers.CallsRealMethods;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.QueryException;
import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DataLocationException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -34,7 +33,12 @@ import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.internal.stubbing.answers.CallsRealMethods;
+import java.io.IOException;
@Category(UnitTest.class)
public class PartitionMessageTest {
@@ -67,6 +71,17 @@ public class PartitionMessageTest {
}
@Test
+ public void shouldBeMockable() throws Exception {
+ PartitionMessage mockPartitionMessage = mock(PartitionMessage.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+
+ when(mockPartitionMessage.getMemberToMasqueradeAs()).thenReturn(mockInternalDistributedMember);
+
+ assertThat(mockPartitionMessage.getMemberToMasqueradeAs())
+ .isSameAs(mockInternalDistributedMember);
+ }
+
+ @Test
public void messageWithNoTXPerformsOnRegion() throws InterruptedException, CacheException,
QueryException, DataLocationException, IOException {
when(txMgr.masqueradeAs(msg)).thenReturn(null);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
new file mode 100644
index 0000000..92b1d2d
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RemoveAllPRMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RemoveAllPRMessage mockRemoveAllPRMessage = mock(RemoveAllPRMessage.class);
+ StringBuilder stringBuilder = new StringBuilder();
+
+ mockRemoveAllPRMessage.appendFields(stringBuilder);
+
+ verify(mockRemoveAllPRMessage, times(1)).appendFields(stringBuilder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
new file mode 100644
index 0000000..3b18079
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class RemoveBucketMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ RemoveBucketMessage mockRemoveBucketMessage = mock(RemoveBucketMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ PartitionedRegion mockPartitionedRegion = mock(PartitionedRegion.class);
+ long startTime = System.currentTimeMillis();
+ Object key = new Object();
+
+ when(mockRemoveBucketMessage.operateOnPartitionedRegion(eq(mockDistributionManager),
+ eq(mockPartitionedRegion), eq(startTime))).thenReturn(true);
+
+ assertThat(mockRemoveBucketMessage.operateOnPartitionedRegion(mockDistributionManager,
+ mockPartitionedRegion, startTime)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
new file mode 100644
index 0000000..da3b94b
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.partitioned;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class SizeMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ SizeMessage mockSizeMessage = mock(SizeMessage.class);
+ when(mockSizeMessage.failIfRegionMissing()).thenReturn(true);
+ assertThat(mockSizeMessage.failIfRegionMissing()).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
new file mode 100644
index 0000000..e7d918d
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.tier.sockets;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater.CCUStats;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class CCUStatsTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ CCUStats mockCCUStats = mock(CCUStats.class);
+
+ mockCCUStats.incReceivedBytes(1L);
+ mockCCUStats.incSentBytes(1L);
+
+ verify(mockCCUStats, times(1)).incReceivedBytes(1L);
+ verify(mockCCUStats, times(1)).incSentBytes(1L);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
new file mode 100644
index 0000000..5720357
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.tier.sockets;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+@Category(UnitTest.class)
+public class PartTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ Part mockPart = mock(Part.class);
+ OutputStream mockOutputStream = mock(OutputStream.class);
+ ByteBuffer mockByteBuffer = mock(ByteBuffer.class);
+
+ mockPart.writeTo(mockOutputStream, mockByteBuffer);
+
+ verify(mockPart, times(1)).writeTo(mockOutputStream, mockByteBuffer);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 0514e19..24b53f0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -49,7 +49,7 @@ public class RegionVersionHolderJUnitTest {
RegionVersionHolder.BIT_SET_WIDTH = originalBitSetWidth;
}
- protected final InternalDistributedMember member() {
+ protected InternalDistributedMember member() {
return member;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index e178708..cb03cbe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -84,7 +84,7 @@ public class TombstoneDUnitTest extends JUnit4CacheTestCase {
}
}
- private final void createRegion(String regionName, boolean persistent) {
+ private void createRegion(String regionName, boolean persistent) {
if (persistent) {
getCache().createRegionFactory(RegionShortcut.REPLICATE_PERSISTENT).create(regionName);
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 5d4fd98..6fe7ee9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -1580,7 +1580,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
@Override
- public final Properties getDistributedSystemProperties() {
+ public Properties getDistributedSystemProperties() {
// For now all WANTestBase tests allocate off-heap memory even though
// many of them never use it.
// The problem is that WANTestBase has static methods that create instances
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 049513b..b21ca90 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -118,7 +118,7 @@ public class AsyncEventQueueValidationsJUnitTest {
.until(() -> filter.getAfterAcknowledgementInvocations() == numPuts);
}
- private final Object[] getCacheXmlFileBaseNames() {
+ private Object[] getCacheXmlFileBaseNames() {
return $(new Object[] {"testSerialAsyncEventQueueConfiguredFromXmlUsesFilter"},
new Object[] {"testParallelAsyncEventQueueConfiguredFromXmlUsesFilter"});
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
new file mode 100644
index 0000000..2d52783
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.wan.serial;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.InternalCacheEvent;
+import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation.DestroyMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DestroyMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DestroyMessage mockDestroyMessageX = mock(DestroyMessage.class);
+ InternalCacheEvent mockInternalCacheEvent = mock(InternalCacheEvent.class);
+ DistributedRegion mockDistributedRegion = mock(DistributedRegion.class);
+
+ when(mockDestroyMessageX.createEvent(eq(mockDistributedRegion)))
+ .thenReturn(mockInternalCacheEvent);
+
+ assertThat(mockDestroyMessageX.createEvent(mockDistributedRegion))
+ .isSameAs(mockInternalCacheEvent);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
new file mode 100644
index 0000000..f89622b
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.xmlcache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.cache.TransactionListener;
+import org.apache.geode.cache.TransactionWriter;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class CacheTransactionManagerCreationTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ CacheTransactionManagerCreation mockCacheTransactionManagerCreation =
+ mock(CacheTransactionManagerCreation.class);
+ TransactionListener mockTransactionListener = mock(TransactionListener.class);
+ TransactionWriter mockTransactionWriter = mock(TransactionWriter.class);
+
+ when(mockCacheTransactionManagerCreation.getListener()).thenReturn(mockTransactionListener);
+
+ mockCacheTransactionManagerCreation.setWriter(mockTransactionWriter);
+
+ verify(mockCacheTransactionManagerCreation, times(1)).setWriter(mockTransactionWriter);
+
+ assertThat(mockCacheTransactionManagerCreation.getListener()).isSameAs(mockTransactionListener);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
new file mode 100644
index 0000000..8142949
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.xmlcache;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.xml.sax.InputSource;
+
+@Category(UnitTest.class)
+public class DefaultEntityResolver2Test {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DefaultEntityResolver2 mockDefaultEntityResolver2 = mock(DefaultEntityResolver2.class);
+ InputSource inputSource = new InputSource();
+
+ when(mockDefaultEntityResolver2.getClassPathInputSource(eq("publicId"), eq("systemId"),
+ eq("path"))).thenReturn(inputSource);
+
+ assertThat(mockDefaultEntityResolver2.getClassPathInputSource("publicId", "systemId", "path"))
+ .isSameAs(inputSource);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
index 66d72d8..67d12de 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
@@ -1170,7 +1170,7 @@ public class CacheJUnitTest {
this.tableName = str;
}
- public final Object load(LoaderHelper helper) throws CacheLoaderException {
+ public Object load(LoaderHelper helper) throws CacheLoaderException {
System.out.println("In Loader.load for" + helper.getKey());
return loadFromDatabase(helper.getKey());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
index 1585486..351c642 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/functional/TestXACacheLoader.java
@@ -34,7 +34,7 @@ public class TestXACacheLoader implements CacheLoader {
public static String tableName = "";
- public final Object load(LoaderHelper helper) throws CacheLoaderException {
+ public Object load(LoaderHelper helper) throws CacheLoaderException {
System.out.println("In Loader.load for" + helper.getKey());
return loadFromDatabase(helper.getKey());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
index 5c7ccaa..7238664 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
@@ -101,7 +101,7 @@ public class LogServiceJUnitTest {
}
@SuppressWarnings("unused")
- private static final Object[] getToLevelParameters() {
+ private static Object[] getToLevelParameters() {
return $(new Object[] {0, Level.OFF}, new Object[] {100, Level.FATAL},
new Object[] {200, Level.ERROR}, new Object[] {300, Level.WARN},
new Object[] {400, Level.INFO}, new Object[] {500, Level.DEBUG},
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
index 5717253..faf1f6a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
@@ -70,7 +70,7 @@ public class AlertAppenderJUnitTest {
* Verify that adding/removing/replacing listeners works correctly.
*/
@Test
- public final void testListenerHandling() throws Exception {
+ public void testListenerHandling() throws Exception {
DistributedMember member1 = createTestDistributedMember("Member1");
DistributedMember member2 = createTestDistributedMember("Member2");
DistributedMember member3 = createTestDistributedMember("Member3");
@@ -146,7 +146,7 @@ public class AlertAppenderJUnitTest {
* when the configuration is changed the appender is still there.
*/
@Test
- public final void testAppenderToConfigHandling() throws Exception {
+ public void testAppenderToConfigHandling() throws Exception {
LogService.setBaseLogLevel(Level.WARN);
final String appenderName = AlertAppender.getInstance().getName();
[40/69] [abbrv] geode git commit: GEODE-2914: Fixed few javadoc
formatting issues.
Posted by ud...@apache.org.
GEODE-2914: Fixed few javadoc formatting issues.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a22b9405
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a22b9405
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a22b9405
Branch: refs/heads/feature/GEODE-2580
Commit: a22b9405f6efa80988af6ee2b263b36bd7908e5b
Parents: a263ade
Author: nabarun <nn...@pivotal.io>
Authored: Tue May 16 17:09:43 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Tue May 16 17:10:40 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/geode/cache/lucene/LuceneService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a22b9405/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
index 3df9ff8..31447f1 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/LuceneService.java
@@ -103,7 +103,7 @@ public interface LuceneService {
public String REGION_VALUE_FIELD = "__REGION_VALUE_FIELD";
/**
- * Get a factory for creating a lucene index on this member.
+ * Get a factory for creating a Lucene index on this member.
*/
public LuceneIndexFactory createIndexFactory();
@@ -151,7 +151,7 @@ public interface LuceneService {
public Cache getCache();
- /*
+ /**
* Wait until the current entries in cache are indexed.
*
* Lucene indexes are maintained asynchronously. This means that updates to the region will not be
[04/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java b/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
index b89b886..ac4e4c8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/UnableToControlProcessException.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.process;
*
* @since GemFire 8.0
*/
-public final class UnableToControlProcessException extends Exception {
+public class UnableToControlProcessException extends Exception {
private static final long serialVersionUID = 7579463534993125290L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
index 86064e4..238abcf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCalls.java
@@ -81,7 +81,7 @@ public abstract class NativeCalls {
}
@SuppressWarnings("unchecked")
- protected static final Map<String, String> getModifiableJavaEnv() {
+ protected static Map<String, String> getModifiableJavaEnv() {
final Map<String, String> env = System.getenv();
try {
final Field m = env.getClass().getDeclaredField("m");
@@ -93,7 +93,7 @@ public abstract class NativeCalls {
}
@SuppressWarnings("unchecked")
- protected static final Map<String, String> getModifiableJavaEnvWIN() {
+ protected static Map<String, String> getModifiableJavaEnvWIN() {
try {
final Field envField = Class.forName("java.lang.ProcessEnvironment")
.getDeclaredField("theCaseInsensitiveEnvironment");
@@ -355,7 +355,7 @@ public abstract class NativeCalls {
* A generic implementation of {@link #setSocketOptions} for POSIX like systems that requires the
* child classes to implement a few platform specific methods.
*/
- protected final Map<TCPSocketOptions, Throwable> setGenericSocketOptions(Socket sock,
+ protected Map<TCPSocketOptions, Throwable> setGenericSocketOptions(Socket sock,
InputStream sockStream, Map<TCPSocketOptions, Object> optValueMap)
throws UnsupportedOperationException {
final Set<Map.Entry<TCPSocketOptions, Object>> optValueEntries = optValueMap.entrySet();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index 92937c9..760144a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -59,7 +59,7 @@ import java.util.HashMap;
*
* @since GemFire 8.0
*/
-public final class NativeCallsJNAImpl {
+public class NativeCallsJNAImpl {
// no instance allowed
private NativeCallsJNAImpl() {}
@@ -69,7 +69,7 @@ public final class NativeCallsJNAImpl {
*/
private static final NativeCalls instance = getImplInstance();
- private static final NativeCalls getImplInstance() {
+ private static NativeCalls getImplInstance() {
if (Platform.isLinux()) {
return new LinuxNativeCalls();
}
@@ -895,7 +895,7 @@ public final class NativeCallsJNAImpl {
/**
* Implementation of {@link NativeCalls} for Windows platforms.
*/
- private static final class WinNativeCalls extends NativeCalls {
+ private static class WinNativeCalls extends NativeCalls {
static {
// for socket operations
@@ -903,7 +903,7 @@ public final class NativeCallsJNAImpl {
}
@SuppressWarnings("unused")
- public static final class TcpKeepAlive extends Structure {
+ public static class TcpKeepAlive extends Structure {
public int onoff;
public int keepalivetime;
public int keepaliveinterval;
@@ -921,7 +921,7 @@ public final class NativeCallsJNAImpl {
static final int WSAENOPROTOOPT = 10042;
static final int SIO_KEEPALIVE_VALS = -1744830460;
- private static final class Kernel32 {
+ private static class Kernel32 {
static {
// kernel32 requires stdcall calling convention
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
index 63001f3..2a2193b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeErrorException.java
@@ -33,7 +33,7 @@ public class NativeErrorException extends Exception {
this.errorCode = errorCode;
}
- public final int getErrorCode() {
+ public int getErrorCode() {
return this.errorCode;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java b/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
index afbf630..a401981 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/OSType.java
@@ -76,7 +76,7 @@ public enum OSType {
/**
* Indicates a Microsoft Windows family OS.
*/
- public final boolean isWindows() {
+ public boolean isWindows() {
return this == WIN;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
index 90d141e..95e8308 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/AbstractStatisticsFactory.java
@@ -59,32 +59,32 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
public void close() {}
@Override
- public final String getName() {
+ public String getName() {
return this.name;
}
@Override
- public final long getId() {
+ public long getId() {
return this.id;
}
@Override
- public final long getStartTime() {
+ public long getStartTime() {
return this.startTime;
}
@Override
- public final int getStatListModCount() {
+ public int getStatListModCount() {
return this.statsListModCount;
}
@Override
- public final List<Statistics> getStatsList() {
+ public List<Statistics> getStatsList() {
return this.statsList;
}
@Override
- public final int getStatisticsCount() {
+ public int getStatisticsCount() {
int result = 0;
List<Statistics> statsList = this.statsList;
if (statsList != null) {
@@ -94,7 +94,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics findStatistics(long id) {
+ public Statistics findStatistics(long id) {
List<Statistics> statsList = this.statsList;
synchronized (statsList) {
for (Statistics s : statsList) {
@@ -108,7 +108,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final boolean statisticsExists(long id) {
+ public boolean statisticsExists(long id) {
List<Statistics> statsList = this.statsList;
for (Statistics s : statsList) {
if (s.getUniqueId() == id) {
@@ -119,7 +119,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics[] getStatistics() {
+ public Statistics[] getStatistics() {
List<Statistics> statsList = this.statsList;
return (Statistics[]) statsList.toArray(new Statistics[statsList.size()]);
}
@@ -127,17 +127,17 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
// StatisticsFactory methods
@Override
- public final Statistics createStatistics(StatisticsType type) {
+ public Statistics createStatistics(StatisticsType type) {
return createOsStatistics(type, null, 0, 0);
}
@Override
- public final Statistics createStatistics(StatisticsType type, String textId) {
+ public Statistics createStatistics(StatisticsType type, String textId) {
return createOsStatistics(type, textId, 0, 0);
}
@Override
- public final Statistics createStatistics(StatisticsType type, String textId, long numericId) {
+ public Statistics createStatistics(StatisticsType type, String textId, long numericId) {
return createOsStatistics(type, textId, 0, 0);
}
@@ -157,7 +157,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics[] findStatisticsByType(StatisticsType type) {
+ public Statistics[] findStatisticsByType(StatisticsType type) {
List<Statistics> hits = new ArrayList<Statistics>();
Iterator<Statistics> it = statsList.iterator();
while (it.hasNext()) {
@@ -171,7 +171,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics[] findStatisticsByTextId(String textId) {
+ public Statistics[] findStatisticsByTextId(String textId) {
List<Statistics> hits = new ArrayList<Statistics>();
Iterator<Statistics> it = statsList.iterator();
while (it.hasNext()) {
@@ -185,7 +185,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics[] findStatisticsByNumericId(long numericId) {
+ public Statistics[] findStatisticsByNumericId(long numericId) {
List<Statistics> hits = new ArrayList<Statistics>();
Iterator<Statistics> it = statsList.iterator();
while (it.hasNext()) {
@@ -198,7 +198,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
return (Statistics[]) hits.toArray(result);
}
- public final Statistics findStatisticsByUniqueId(long uniqueId) {
+ public Statistics findStatisticsByUniqueId(long uniqueId) {
Iterator<Statistics> it = statsList.iterator();
while (it.hasNext()) {
Statistics s = (Statistics) it.next();
@@ -211,7 +211,7 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
/** for internal use only. Its called by {@link LocalStatisticsImpl#close}. */
@Override
- public final void destroyStatistics(Statistics stats) {
+ public void destroyStatistics(Statistics stats) {
synchronized (statsList) {
if (statsList.remove(stats)) {
statsListModCount++;
@@ -220,12 +220,12 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
}
@Override
- public final Statistics createAtomicStatistics(StatisticsType type) {
+ public Statistics createAtomicStatistics(StatisticsType type) {
return createAtomicStatistics(type, null, 0);
}
@Override
- public final Statistics createAtomicStatistics(StatisticsType type, String textId) {
+ public Statistics createAtomicStatistics(StatisticsType type, String textId) {
return createAtomicStatistics(type, textId, 0);
}
@@ -249,86 +249,82 @@ public abstract class AbstractStatisticsFactory implements StatisticsFactory, St
* Creates or finds a StatisticType for the given shared class.
*/
@Override
- public final StatisticsType createType(String name, String description,
- StatisticDescriptor[] stats) {
+ public StatisticsType createType(String name, String description, StatisticDescriptor[] stats) {
return tf.createType(name, description, stats);
}
@Override
- public final StatisticsType findType(String name) {
+ public StatisticsType findType(String name) {
return tf.findType(name);
}
@Override
- public final StatisticsType[] createTypesFromXml(Reader reader) throws IOException {
+ public StatisticsType[] createTypesFromXml(Reader reader) throws IOException {
return tf.createTypesFromXml(reader);
}
@Override
- public final StatisticDescriptor createIntCounter(String name, String description, String units) {
+ public StatisticDescriptor createIntCounter(String name, String description, String units) {
return tf.createIntCounter(name, description, units);
}
@Override
- public final StatisticDescriptor createLongCounter(String name, String description,
- String units) {
+ public StatisticDescriptor createLongCounter(String name, String description, String units) {
return tf.createLongCounter(name, description, units);
}
@Override
- public final StatisticDescriptor createDoubleCounter(String name, String description,
- String units) {
+ public StatisticDescriptor createDoubleCounter(String name, String description, String units) {
return tf.createDoubleCounter(name, description, units);
}
@Override
- public final StatisticDescriptor createIntGauge(String name, String description, String units) {
+ public StatisticDescriptor createIntGauge(String name, String description, String units) {
return tf.createIntGauge(name, description, units);
}
@Override
- public final StatisticDescriptor createLongGauge(String name, String description, String units) {
+ public StatisticDescriptor createLongGauge(String name, String description, String units) {
return tf.createLongGauge(name, description, units);
}
@Override
- public final StatisticDescriptor createDoubleGauge(String name, String description,
- String units) {
+ public StatisticDescriptor createDoubleGauge(String name, String description, String units) {
return tf.createDoubleGauge(name, description, units);
}
@Override
- public final StatisticDescriptor createIntCounter(String name, String description, String units,
+ public StatisticDescriptor createIntCounter(String name, String description, String units,
boolean largerBetter) {
return tf.createIntCounter(name, description, units, largerBetter);
}
@Override
- public final StatisticDescriptor createLongCounter(String name, String description, String units,
+ public StatisticDescriptor createLongCounter(String name, String description, String units,
boolean largerBetter) {
return tf.createLongCounter(name, description, units, largerBetter);
}
@Override
- public final StatisticDescriptor createDoubleCounter(String name, String description,
- String units, boolean largerBetter) {
+ public StatisticDescriptor createDoubleCounter(String name, String description, String units,
+ boolean largerBetter) {
return tf.createDoubleCounter(name, description, units, largerBetter);
}
@Override
- public final StatisticDescriptor createIntGauge(String name, String description, String units,
+ public StatisticDescriptor createIntGauge(String name, String description, String units,
boolean largerBetter) {
return tf.createIntGauge(name, description, units, largerBetter);
}
@Override
- public final StatisticDescriptor createLongGauge(String name, String description, String units,
+ public StatisticDescriptor createLongGauge(String name, String description, String units,
boolean largerBetter) {
return tf.createLongGauge(name, description, units, largerBetter);
}
@Override
- public final StatisticDescriptor createDoubleGauge(String name, String description, String units,
+ public StatisticDescriptor createDoubleGauge(String name, String description, String units,
boolean largerBetter) {
return tf.createDoubleGauge(name, description, units, largerBetter);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/CounterMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/CounterMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/CounterMonitor.java
index 7e0ce4f..d42ff4b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/CounterMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/CounterMonitor.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.statistics;
/**
* @since GemFire 7.0
*/
-public final class CounterMonitor extends StatisticsMonitor {
+public class CounterMonitor extends StatisticsMonitor {
public static enum Type {
GREATER_THAN, LESS_THAN
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
index 120bf54..ed38f21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/DummyStatisticsImpl.java
@@ -49,137 +49,137 @@ public class DummyStatisticsImpl implements Statistics {
this.numericId = numericId;
}
- public final void close() {}
+ public void close() {}
//////////////////////// accessor Methods ///////////////////////
- public final int nameToId(String name) {
+ public int nameToId(String name) {
return this.type.nameToId(name);
}
- public final StatisticDescriptor nameToDescriptor(String name) {
+ public StatisticDescriptor nameToDescriptor(String name) {
return this.type.nameToDescriptor(name);
}
- public final long getUniqueId() {
+ public long getUniqueId() {
return 0;
}
- public final StatisticsType getType() {
+ public StatisticsType getType() {
return this.type;
}
- public final String getTextId() {
+ public String getTextId() {
return this.textId;
}
- public final long getNumericId() {
+ public long getNumericId() {
return this.numericId;
}
- public final boolean isAtomic() {
+ public boolean isAtomic() {
return true;
}
- public final boolean isClosed() {
+ public boolean isClosed() {
return false;
}
//////////////////////// set() Methods ///////////////////////
- public final void setInt(int id, int value) {}
+ public void setInt(int id, int value) {}
- public final void setInt(StatisticDescriptor descriptor, int value) {}
+ public void setInt(StatisticDescriptor descriptor, int value) {}
- public final void setInt(String name, int value) {}
+ public void setInt(String name, int value) {}
- public final void setLong(int id, long value) {}
+ public void setLong(int id, long value) {}
- public final void setLong(StatisticDescriptor descriptor, long value) {}
+ public void setLong(StatisticDescriptor descriptor, long value) {}
- public final void setLong(String name, long value) {}
+ public void setLong(String name, long value) {}
- public final void setDouble(int id, double value) {}
+ public void setDouble(int id, double value) {}
- public final void setDouble(StatisticDescriptor descriptor, double value) {}
+ public void setDouble(StatisticDescriptor descriptor, double value) {}
- public final void setDouble(String name, double value) {}
+ public void setDouble(String name, double value) {}
/////////////////////// get() Methods ///////////////////////
- public final int getInt(int id) {
+ public int getInt(int id) {
return 0;
}
- public final int getInt(StatisticDescriptor descriptor) {
+ public int getInt(StatisticDescriptor descriptor) {
return 0;
}
- public final int getInt(String name) {
+ public int getInt(String name) {
return 0;
}
- public final long getLong(int id) {
+ public long getLong(int id) {
return 0;
}
- public final long getLong(StatisticDescriptor descriptor) {
+ public long getLong(StatisticDescriptor descriptor) {
return 0;
}
- public final long getLong(String name) {
+ public long getLong(String name) {
return 0;
}
- public final double getDouble(int id) {
+ public double getDouble(int id) {
return 0.0;
}
- public final double getDouble(StatisticDescriptor descriptor) {
+ public double getDouble(StatisticDescriptor descriptor) {
return 0.0;
}
- public final double getDouble(String name) {
+ public double getDouble(String name) {
return 0.0;
}
private static final Number dummyNumber = Integer.valueOf(0);
- public final Number get(StatisticDescriptor descriptor) {
+ public Number get(StatisticDescriptor descriptor) {
return dummyNumber;
}
- public final Number get(String name) {
+ public Number get(String name) {
return dummyNumber;
}
- public final long getRawBits(StatisticDescriptor descriptor) {
+ public long getRawBits(StatisticDescriptor descriptor) {
return 0;
}
- public final long getRawBits(String name) {
+ public long getRawBits(String name) {
return 0;
}
//////////////////////// inc() Methods ////////////////////////
- public final void incInt(int id, int delta) {}
+ public void incInt(int id, int delta) {}
- public final void incInt(StatisticDescriptor descriptor, int delta) {}
+ public void incInt(StatisticDescriptor descriptor, int delta) {}
- public final void incInt(String name, int delta) {}
+ public void incInt(String name, int delta) {}
- public final void incLong(int id, long delta) {}
+ public void incLong(int id, long delta) {}
- public final void incLong(StatisticDescriptor descriptor, long delta) {}
+ public void incLong(StatisticDescriptor descriptor, long delta) {}
- public final void incLong(String name, long delta) {}
+ public void incLong(String name, long delta) {}
- public final void incDouble(int id, double delta) {}
+ public void incDouble(int id, double delta) {}
- public final void incDouble(StatisticDescriptor descriptor, double delta) {}
+ public void incDouble(StatisticDescriptor descriptor, double delta) {}
- public final void incDouble(String name, double delta) {}
+ public void incDouble(String name, double delta) {}
@Override
public IntSupplier setIntSupplier(final int id, final IntSupplier supplier) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/GaugeMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/GaugeMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/GaugeMonitor.java
index 3b07337..8990b6e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/GaugeMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/GaugeMonitor.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.statistics;
/**
* @since GemFire 7.0
*/
-public final class GaugeMonitor extends StatisticsMonitor {
+public class GaugeMonitor extends StatisticsMonitor {
private final Number lowThreshold;
private final Number highThreshold;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
index d4698ef..1bc6b8a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/GemFireStatSampler.java
@@ -46,7 +46,7 @@ import org.apache.logging.log4j.Logger;
* The StatisticsManager is implemented by DistributedSystem.
*
*/
-public final class GemFireStatSampler extends HostStatSampler {
+public class GemFireStatSampler extends HostStatSampler {
private static final Logger logger = LogService.getLogger();
@@ -78,7 +78,7 @@ public final class GemFireStatSampler extends HostStatSampler {
*
* @since GemFire 3.5
*/
- public final ProcessStats getProcessStats() {
+ public ProcessStats getProcessStats() {
return this.processStats;
}
@@ -157,12 +157,12 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- public final File getArchiveFileName() {
+ public File getArchiveFileName() {
return this.con.getConfig().getStatisticArchiveFile();
}
@Override
- public final long getArchiveFileSizeLimit() {
+ public long getArchiveFileSizeLimit() {
if (fileSizeLimitInKB()) {
// use KB instead of MB to speed up rolling for testing
return ((long) this.con.getConfig().getArchiveFileSizeLimit()) * (1024);
@@ -172,7 +172,7 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- public final long getArchiveDiskSpaceLimit() {
+ public long getArchiveDiskSpaceLimit() {
if (fileSizeLimitInKB()) {
// use KB instead of MB to speed up removal for testing
return ((long) this.con.getConfig().getArchiveDiskSpaceLimit()) * (1024);
@@ -216,27 +216,27 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- protected final int getSampleRate() {
+ protected int getSampleRate() {
return this.con.getConfig().getStatisticSampleRate();
}
@Override
- public final boolean isSamplingEnabled() {
+ public boolean isSamplingEnabled() {
return this.con.getConfig().getStatisticSamplingEnabled();
}
@Override
- protected final StatisticsManager getStatisticsManager() {
+ protected StatisticsManager getStatisticsManager() {
return this.con;
}
@Override
- protected final OsStatisticsFactory getOsStatisticsFactory() {
+ protected OsStatisticsFactory getOsStatisticsFactory() {
return this.con;
}
@Override
- protected final long getSpecialStatsId() {
+ protected long getSpecialStatsId() {
long statId = OSProcess.getId();
if (statId == 0 || statId == -1) {
statId = getStatisticsManager().getId();
@@ -245,7 +245,7 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- protected final void initProcessStats(long id) {
+ protected void initProcessStats(long id) {
if (PureJavaMode.osStatsAreAvailable()) {
if (osStatsDisabled()) {
logger.info(LogMarker.STATISTICS, LocalizedMessage.create(
@@ -269,7 +269,7 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- protected final void sampleProcessStats(boolean prepareOnly) {
+ protected void sampleProcessStats(boolean prepareOnly) {
if (prepareOnly || osStatsDisabled() || !PureJavaMode.osStatsAreAvailable()) {
return;
}
@@ -292,7 +292,7 @@ public final class GemFireStatSampler extends HostStatSampler {
}
@Override
- protected final void closeProcessStats() {
+ protected void closeProcessStats() {
if (PureJavaMode.osStatsAreAvailable()) {
if (!osStatsDisabled()) {
if (this.processStats != null) {
@@ -415,12 +415,12 @@ public final class GemFireStatSampler extends HostStatSampler {
private InternalDistributedMember recipient;
@Override
- public final int hashCode() {
+ public int hashCode() {
return listenerId;
}
@Override
- public final boolean equals(Object o) {
+ public boolean equals(Object o) {
if (o == null) {
return false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index c3ed946..928956e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -106,7 +106,7 @@ public abstract class HostStatSampler
this.timer = timer;
}
- public final StatSamplerStats getStatSamplerStats() {
+ public StatSamplerStats getStatSamplerStats() {
return this.samplerStats;
}
@@ -114,7 +114,7 @@ public abstract class HostStatSampler
* Returns the number of times a statistics resource has been add or deleted.
*/
@Override
- public final int getStatisticsModCount() {
+ public int getStatisticsModCount() {
return getStatisticsManager().getStatListModCount();
}
@@ -122,7 +122,7 @@ public abstract class HostStatSampler
* Returns an array of all the current statistic resource instances.
*/
@Override
- public final Statistics[] getStatistics() {
+ public Statistics[] getStatistics() {
return getStatisticsManager().getStatistics();
}
@@ -130,7 +130,7 @@ public abstract class HostStatSampler
* Returns a unique id for the sampler's system.
*/
@Override
- public final long getSystemId() {
+ public long getSystemId() {
return getStatisticsManager().getId();
}
@@ -138,7 +138,7 @@ public abstract class HostStatSampler
* Returns the time this sampler's system was started.
*/
@Override
- public final long getSystemStartTime() {
+ public long getSystemStartTime() {
return getStatisticsManager().getStartTime();
}
@@ -146,7 +146,7 @@ public abstract class HostStatSampler
* Returns the path to this sampler's system directory; if it has one.
*/
@Override
- public final String getSystemDirectoryPath() {
+ public String getSystemDirectoryPath() {
try {
return SocketCreator.getHostName(SocketCreator.getLocalHost());
} catch (UnknownHostException ignore) {
@@ -179,7 +179,7 @@ public abstract class HostStatSampler
* This service's main loop
*/
@Override
- public final void run() {
+ public void run() {
final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
if (isDebugEnabled_STATISTICS) {
logger.trace(LogMarker.STATISTICS, "HostStatSampler started");
@@ -275,7 +275,7 @@ public abstract class HostStatSampler
* @throws IllegalStateException if an instance of the {@link #statThread} is still running from a
* previous DistributedSystem.
*/
- public final void start() {
+ public void start() {
synchronized (HostStatSampler.class) {
if (statThread != null) {
try {
@@ -311,11 +311,11 @@ public abstract class HostStatSampler
/**
* Tell this service's main thread to terminate.
*/
- public final void stop() {
+ public void stop() {
stop(true);
}
- private final void stop(boolean interruptIfAlive) {
+ private void stop(boolean interruptIfAlive) {
synchronized (HostStatSampler.class) {
this.callbackSampler.stop();
if (statThread == null) {
@@ -354,7 +354,7 @@ public abstract class HostStatSampler
}
}
- public final boolean isAlive() {
+ public boolean isAlive() {
synchronized (HostStatSampler.class) {
return statThread != null && statThread.isAlive();
}
@@ -367,7 +367,7 @@ public abstract class HostStatSampler
* @see #initSpecialStats
* @since GemFire 3.5
*/
- public final void waitForInitialization() throws InterruptedException {
+ public void waitForInitialization() throws InterruptedException {
this.statSamplerInitializedLatch.await();
}
@@ -378,7 +378,7 @@ public abstract class HostStatSampler
* @see #initSpecialStats
* @since GemFire 7.0
*/
- public final boolean waitForInitialization(long ms) throws InterruptedException {
+ public boolean waitForInitialization(long ms) throws InterruptedException {
return awaitInitialization(ms, TimeUnit.MILLISECONDS);
}
@@ -387,12 +387,12 @@ public abstract class HostStatSampler
*
* @see #initSpecialStats
*/
- public final boolean awaitInitialization(final long timeout, final TimeUnit unit)
+ public boolean awaitInitialization(final long timeout, final TimeUnit unit)
throws InterruptedException {
return this.statSamplerInitializedLatch.await(timeout, unit);
}
- public final void changeArchive(File newFile) {
+ public void changeArchive(File newFile) {
this.sampleCollector.changeArchive(newFile, timer.getTime());
}
@@ -401,7 +401,7 @@ public abstract class HostStatSampler
*
* @since GemFire 3.5
*/
- public final VMStatsContract getVMStats() {
+ public VMStatsContract getVMStats() {
return this.vmStats;
}
@@ -449,19 +449,19 @@ public abstract class HostStatSampler
return getStatisticsManager().getId();
}
- protected final boolean fileSizeLimitInKB() {
+ protected boolean fileSizeLimitInKB() {
return this.fileSizeLimitInKB;
}
- protected final boolean osStatsDisabled() {
+ protected boolean osStatsDisabled() {
return this.osStatsDisabled;
}
- protected final boolean stopRequested() {
+ protected boolean stopRequested() {
return stopper.isCancelInProgress() || this.stopRequested;
}
- public final SampleCollector getSampleCollector() {
+ public SampleCollector getSampleCollector() {
return this.sampleCollector;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
index 02292aa..28056e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/LocalStatisticsImpl.java
@@ -165,7 +165,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
////////////////////// Instance Methods //////////////////////
@Override
- public final boolean isAtomic() {
+ public boolean isAtomic() {
return intLocks != null || longLocks != null || doubleLocks != null;
}
@@ -180,41 +180,41 @@ public class LocalStatisticsImpl extends StatisticsImpl {
//////////////////////// store() Methods ///////////////////////
@Override
- protected final void _setInt(int offset, int value) {
+ protected void _setInt(int offset, int value) {
this.intStorage[offset] = value;
}
@Override
- protected final void _setLong(int offset, long value) {
+ protected void _setLong(int offset, long value) {
this.longStorage[offset] = value;
}
@Override
- protected final void _setDouble(int offset, double value) {
+ protected void _setDouble(int offset, double value) {
this.doubleStorage[offset] = value;
}
/////////////////////// get() Methods ///////////////////////
@Override
- protected final int _getInt(int offset) {
+ protected int _getInt(int offset) {
return this.intStorage[offset];
}
@Override
- protected final long _getLong(int offset) {
+ protected long _getLong(int offset) {
return this.longStorage[offset];
}
@Override
- protected final double _getDouble(int offset) {
+ protected double _getDouble(int offset) {
return this.doubleStorage[offset];
}
//////////////////////// inc() Methods ////////////////////////
@Override
- protected final void _incInt(int offset, int delta) {
+ protected void _incInt(int offset, int delta) {
if (this.intLocks != null) {
synchronized (this.intLocks[offset]) {
this.intStorage[offset] += delta;
@@ -225,7 +225,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
}
@Override
- protected final void _incLong(int offset, long delta) {
+ protected void _incLong(int offset, long delta) {
if (this.longLocks != null) {
synchronized (this.longLocks[offset]) {
this.longStorage[offset] += delta;
@@ -236,7 +236,7 @@ public class LocalStatisticsImpl extends StatisticsImpl {
}
@Override
- protected final void _incDouble(int offset, double delta) {
+ protected void _incDouble(int offset, double delta) {
if (this.doubleLocks != null) {
synchronized (this.doubleLocks[offset]) {
this.doubleStorage[offset] += delta;
@@ -248,15 +248,15 @@ public class LocalStatisticsImpl extends StatisticsImpl {
/////////////////// internal package methods //////////////////
- final int[] _getIntStorage() {
+ int[] _getIntStorage() {
return this.intStorage;
}
- final long[] _getLongStorage() {
+ long[] _getLongStorage() {
return this.longStorage;
}
- final double[] _getDoubleStorage() {
+ double[] _getDoubleStorage() {
return this.doubleStorage;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
index 2abbecd..0fc76cf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
@@ -293,7 +293,7 @@ public class SampleCollector {
}
}
- public final void changeArchive(File newFile, long nanosTimeStamp) {
+ public void changeArchive(File newFile, long nanosTimeStamp) {
synchronized (this.sampleHandlers) {
if (logger.isTraceEnabled(LogMarker.STATISTICS)) {
logger.trace(LogMarker.STATISTICS,
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
index 64fc2f0..fd6bbb2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatisticId.java
@@ -26,7 +26,7 @@ import org.apache.geode.Statistics;
*
* @since GemFire 7.0
*/
-public final class SimpleStatisticId implements StatisticId {
+public class SimpleStatisticId implements StatisticId {
private final StatisticDescriptor descriptor;
private final Statistics statistics;
@@ -50,7 +50,7 @@ public final class SimpleStatisticId implements StatisticId {
* Object equality must be based on instance identity.
*/
@Override
- public final boolean equals(Object obj) {
+ public boolean equals(Object obj) {
return super.equals(obj);
}
@@ -58,7 +58,7 @@ public final class SimpleStatisticId implements StatisticId {
* Object equality must be based on instance identity.
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
return super.hashCode();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
index 65e4370..36888e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
@@ -1344,7 +1344,7 @@ public class StatArchiveReader implements StatArchiveFormat {
protected int count;
- public final int getSampleCount() {
+ public int getSampleCount() {
return this.count;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
index 4eabe3b..3d375ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveWriter.java
@@ -800,85 +800,85 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
this.dataOut = new DataOutputStream(out);
}
- public final long getBytesWritten() {
+ public long getBytesWritten() {
return this.bytesWritten;
}
- public final void flush() throws IOException {
+ public void flush() throws IOException {
this.dataOut.flush();
}
@SuppressWarnings("unused")
- public final void close() throws IOException {
+ public void close() throws IOException {
this.dataOut.close();
}
- public final void write(int b) throws IOException {
+ public void write(int b) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void write(byte[] b, int off, int len) throws IOException {
+ public void write(byte[] b, int off, int len) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void write(byte[] b) throws IOException {
+ public void write(byte[] b) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeBytes(String v) throws IOException {
+ public void writeBytes(String v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeChar(int v) throws IOException {
+ public void writeChar(int v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeChars(String v) throws IOException {
+ public void writeChars(String v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeDouble(double v) throws IOException {
+ public void writeDouble(double v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeFloat(float v) throws IOException {
+ public void writeFloat(float v) throws IOException {
throw new RuntimeException(
LocalizedStrings.StatArchiveWriter_METHOD_UNIMPLEMENTED.toLocalizedString());
}
- public final void writeBoolean(boolean v) throws IOException {
+ public void writeBoolean(boolean v) throws IOException {
this.dataOut.writeBoolean(v);
this.bytesWritten += 1;
}
- public final void writeByte(int v) throws IOException {
+ public void writeByte(int v) throws IOException {
this.dataOut.writeByte(v);
this.bytesWritten += 1;
}
- public final void writeShort(int v) throws IOException {
+ public void writeShort(int v) throws IOException {
this.dataOut.writeShort(v);
this.bytesWritten += 2;
}
- public final void writeInt(int v) throws IOException {
+ public void writeInt(int v) throws IOException {
this.dataOut.writeInt(v);
this.bytesWritten += 4;
}
- public final void writeLong(long v) throws IOException {
+ public void writeLong(long v) throws IOException {
this.dataOut.writeLong(v);
this.bytesWritten += 8;
}
- public final void writeUTF(String v) throws IOException {
+ public void writeUTF(String v) throws IOException {
this.dataOut.writeUTF(v);
this.bytesWritten += v.length() + 2; // this is the minimum. The max is v.size()*3 +2
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
index b280c6d..1a59616 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticDescriptorImpl.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 3.0
*/
-public final class StatisticDescriptorImpl implements StatisticDescriptor {
+public class StatisticDescriptorImpl implements StatisticDescriptor {
/** A constant for an <code>byte</code> type */
static final byte BYTE = (byte) 3;
@@ -82,7 +82,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static String getTypeCodeName(int code) {
+ public static String getTypeCodeName(int code) {
switch (code) {
case BYTE:
return "byte";
@@ -108,7 +108,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static int getTypeCodeBits(int code) {
+ public static int getTypeCodeBits(int code) {
switch (code) {
case BYTE:
return 8;
@@ -134,7 +134,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
*
* @throws IllegalArgumentException <code>code</code> is an unknown type
*/
- public final static Class<?> getTypeCodeClass(byte code) {
+ public static Class<?> getTypeCodeClass(byte code) {
switch (code) {
case BYTE:
return byte.class;
@@ -227,35 +227,35 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
//////////////////// StatisticDescriptor Methods ////////////////////
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final String getDescription() {
+ public String getDescription() {
return this.description;
}
- public final Class<?> getType() {
+ public Class<?> getType() {
return getTypeCodeClass(this.typeCode);
}
- public final int getStorageBits() {
+ public int getStorageBits() {
return getTypeCodeBits(this.typeCode);
}
- public final boolean isCounter() {
+ public boolean isCounter() {
return this.isCounter;
}
- public final boolean isLargerBetter() {
+ public boolean isLargerBetter() {
return this.isLargerBetter;
}
- public final String getUnit() {
+ public String getUnit() {
return this.unit;
}
- public final int getId() {
+ public int getId() {
// if (this.id == INVALID_OFFSET) {
// String s = "The id has not been initialized yet.";
// throw new IllegalStateException(s);
@@ -265,7 +265,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final Number getNumberForRawBits(long bits) {
+ public Number getNumberForRawBits(long bits) {
switch (this.typeCode) {
case StatisticDescriptorImpl.INT:
return (int) bits;
@@ -285,14 +285,14 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
/**
* Returns the type code of this statistic
*/
- public final byte getTypeCode() {
+ public byte getTypeCode() {
return this.typeCode;
}
/**
* Sets the id of this descriptor
*/
- final void setId(int id) {
+ void setId(int id) {
// Assert.assertTrue(id >= 0);
this.id = id;
}
@@ -309,7 +309,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
return this.getName().compareTo(o.getName());
}
- public final int checkInt() {
+ public int checkInt() {
if (this.typeCode != INT) {
throw new IllegalArgumentException(
LocalizedStrings.StatisticDescriptorImpl_THE_STATISTIC_0_WITH_ID_1_IS_OF_TYPE_2_AND_IT_WAS_EXPECTED_TO_BE_AN_INT
@@ -319,7 +319,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final int checkLong() {
+ public int checkLong() {
if (this.typeCode != LONG) {
StringBuffer sb = new StringBuffer();
sb.append("The statistic " + getName() + " with id ");
@@ -333,7 +333,7 @@ public final class StatisticDescriptorImpl implements StatisticDescriptor {
return this.id;
}
- public final int checkDouble() {
+ public int checkDouble() {
if (this.typeCode != DOUBLE) {
throw new IllegalArgumentException(
LocalizedStrings.StatisticDescriptorImpl_THE_STATISTIC_0_WITH_ID_1_IS_OF_TYPE_2_AND_IT_WAS_EXPECTED_TO_BE_A_DOUBLE
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
index 0572d4c..0e2f5f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsImpl.java
@@ -124,19 +124,19 @@ public abstract class StatisticsImpl implements Statistics {
////////////////////// Instance Methods //////////////////////
- public final boolean usesSystemCalls() {
+ public boolean usesSystemCalls() {
return this.osStatFlags != 0;
}
- public final int getOsStatFlags() {
+ public int getOsStatFlags() {
return this.osStatFlags;
}
- public final int nameToId(String name) {
+ public int nameToId(String name) {
return this.type.nameToId(name);
}
- public final StatisticDescriptor nameToDescriptor(String name) {
+ public StatisticDescriptor nameToDescriptor(String name) {
return this.type.nameToDescriptor(name);
}
@@ -144,27 +144,27 @@ public abstract class StatisticsImpl implements Statistics {
this.closed = true;
}
- public final boolean isClosed() {
+ public boolean isClosed() {
return this.closed;
}
public abstract boolean isAtomic();
- private final boolean isOpen() { // fix for bug 29973
+ private boolean isOpen() { // fix for bug 29973
return !this.closed;
}
//////////////////////// attribute Methods ///////////////////////
- public final StatisticsType getType() {
+ public StatisticsType getType() {
return this.type;
}
- public final String getTextId() {
+ public String getTextId() {
return this.textId;
}
- public final long getNumericId() {
+ public long getNumericId() {
return this.numericId;
}
@@ -184,15 +184,15 @@ public abstract class StatisticsImpl implements Statistics {
//////////////////////// set() Methods ///////////////////////
- public final void setInt(String name, int value) {
+ public void setInt(String name, int value) {
setInt(nameToDescriptor(name), value);
}
- public final void setInt(StatisticDescriptor descriptor, int value) {
+ public void setInt(StatisticDescriptor descriptor, int value) {
setInt(getIntId(descriptor), value);
}
- public final void setInt(int id, int value) {
+ public void setInt(int id, int value) {
if (isOpen()) {
_setInt(id, value);
}
@@ -204,15 +204,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _setInt(int offset, int value);
- public final void setLong(String name, long value) {
+ public void setLong(String name, long value) {
setLong(nameToDescriptor(name), value);
}
- public final void setLong(StatisticDescriptor descriptor, long value) {
+ public void setLong(StatisticDescriptor descriptor, long value) {
setLong(getLongId(descriptor), value);
}
- public final void setLong(int id, long value) {
+ public void setLong(int id, long value) {
if (isOpen()) {
_setLong(id, value);
}
@@ -224,15 +224,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _setLong(int offset, long value);
- public final void setDouble(String name, double value) {
+ public void setDouble(String name, double value) {
setDouble(nameToDescriptor(name), value);
}
- public final void setDouble(StatisticDescriptor descriptor, double value) {
+ public void setDouble(StatisticDescriptor descriptor, double value) {
setDouble(getDoubleId(descriptor), value);
}
- public final void setDouble(int id, double value) {
+ public void setDouble(int id, double value) {
if (isOpen()) {
_setDouble(id, value);
}
@@ -246,15 +246,15 @@ public abstract class StatisticsImpl implements Statistics {
/////////////////////// get() Methods ///////////////////////
- public final int getInt(String name) {
+ public int getInt(String name) {
return getInt(nameToDescriptor(name));
}
- public final int getInt(StatisticDescriptor descriptor) {
+ public int getInt(StatisticDescriptor descriptor) {
return getInt(getIntId(descriptor));
}
- public final int getInt(int id) {
+ public int getInt(int id) {
if (isOpen()) {
return _getInt(id);
} else {
@@ -269,15 +269,15 @@ public abstract class StatisticsImpl implements Statistics {
protected abstract int _getInt(int offset);
- public final long getLong(String name) {
+ public long getLong(String name) {
return getLong(nameToDescriptor(name));
}
- public final long getLong(StatisticDescriptor descriptor) {
+ public long getLong(StatisticDescriptor descriptor) {
return getLong(getLongId(descriptor));
}
- public final long getLong(int id) {
+ public long getLong(int id) {
if (isOpen()) {
return _getLong(id);
} else {
@@ -292,15 +292,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract long _getLong(int offset);
- public final double getDouble(String name) {
+ public double getDouble(String name) {
return getDouble(nameToDescriptor(name));
}
- public final double getDouble(StatisticDescriptor descriptor) {
+ public double getDouble(StatisticDescriptor descriptor) {
return getDouble(getDoubleId(descriptor));
}
- public final double getDouble(int id) {
+ public double getDouble(int id) {
if (isOpen()) {
return _getDouble(id);
} else {
@@ -314,7 +314,7 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract double _getDouble(int offset);
- public final Number get(StatisticDescriptor descriptor) {
+ public Number get(StatisticDescriptor descriptor) {
if (isOpen()) {
return _get((StatisticDescriptorImpl) descriptor);
} else {
@@ -322,7 +322,7 @@ public abstract class StatisticsImpl implements Statistics {
}
}
- public final Number get(String name) {
+ public Number get(String name) {
return get(nameToDescriptor(name));
}
@@ -340,15 +340,15 @@ public abstract class StatisticsImpl implements Statistics {
//////////////////////// inc() Methods ////////////////////////
- public final void incInt(String name, int delta) {
+ public void incInt(String name, int delta) {
incInt(nameToDescriptor(name), delta);
}
- public final void incInt(StatisticDescriptor descriptor, int delta) {
+ public void incInt(StatisticDescriptor descriptor, int delta) {
incInt(getIntId(descriptor), delta);
}
- public final void incInt(int id, int delta) {
+ public void incInt(int id, int delta) {
if (isOpen()) {
_incInt(id, delta);
}
@@ -360,15 +360,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _incInt(int offset, int delta);
- public final void incLong(String name, long delta) {
+ public void incLong(String name, long delta) {
incLong(nameToDescriptor(name), delta);
}
- public final void incLong(StatisticDescriptor descriptor, long delta) {
+ public void incLong(StatisticDescriptor descriptor, long delta) {
incLong(getLongId(descriptor), delta);
}
- public final void incLong(int id, long delta) {
+ public void incLong(int id, long delta) {
if (isOpen()) {
_incLong(id, delta);
}
@@ -380,15 +380,15 @@ public abstract class StatisticsImpl implements Statistics {
*/
protected abstract void _incLong(int offset, long delta);
- public final void incDouble(String name, double delta) {
+ public void incDouble(String name, double delta) {
incDouble(nameToDescriptor(name), delta);
}
- public final void incDouble(StatisticDescriptor descriptor, double delta) {
+ public void incDouble(StatisticDescriptor descriptor, double delta) {
incDouble(getDoubleId(descriptor), delta);
}
- public final void incDouble(int id, double delta) {
+ public void incDouble(int id, double delta) {
if (isOpen()) {
_incDouble(id, delta);
}
@@ -533,22 +533,22 @@ public abstract class StatisticsImpl implements Statistics {
return this.uniqueId == other.getUniqueId();
}
- private final static int getIntId(StatisticDescriptor descriptor) {
+ private static int getIntId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkInt();
}
- private final static int getLongId(StatisticDescriptor descriptor) {
+ private static int getLongId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkLong();
}
- private final static int getDoubleId(StatisticDescriptor descriptor) {
+ private static int getDoubleId(StatisticDescriptor descriptor) {
return ((StatisticDescriptorImpl) descriptor).checkDouble();
}
/**
* Returns the value of the specified statistic descriptor.
*/
- private final Number _get(StatisticDescriptorImpl stat) {
+ private Number _get(StatisticDescriptorImpl stat) {
switch (stat.getTypeCode()) {
case StatisticDescriptorImpl.INT:
return Integer.valueOf(_getInt(stat.getId()));
@@ -566,7 +566,7 @@ public abstract class StatisticsImpl implements Statistics {
/**
* Returns the bits that represent the raw value of the specified statistic descriptor.
*/
- private final long _getRawBits(StatisticDescriptorImpl stat) {
+ private long _getRawBits(StatisticDescriptorImpl stat) {
switch (stat.getTypeCode()) {
case StatisticDescriptorImpl.INT:
return _getInt(stat.getId());
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
index 5a025f9..df67d74 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeFactoryImpl.java
@@ -38,11 +38,11 @@ public class StatisticsTypeFactoryImpl implements StatisticsTypeFactory {
/**
* Returns the single instance of this class.
*/
- public final static StatisticsTypeFactory singleton() {
+ public static StatisticsTypeFactory singleton() {
return singleton;
}
- protected final static void clear() {
+ protected static void clear() {
singleton.statTypes.clear();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
index 2c7fd3c..c6594ef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsTypeImpl.java
@@ -152,23 +152,23 @@ public class StatisticsTypeImpl implements StatisticsType {
////////////////////// StatisticsType Methods //////////////////////
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final String getDescription() {
+ public String getDescription() {
return this.description;
}
- public final StatisticDescriptor[] getStatistics() {
+ public StatisticDescriptor[] getStatistics() {
return this.stats;
}
- public final int nameToId(String name) {
+ public int nameToId(String name) {
return nameToDescriptor(name).getId();
}
- public final StatisticDescriptor nameToDescriptor(String name) {
+ public StatisticDescriptor nameToDescriptor(String name) {
StatisticDescriptorImpl stat = (StatisticDescriptorImpl) statsMap.get(name);
if (stat == null) {
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
index fc2fd05..690b514 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/platform/ProcessStats.java
@@ -40,11 +40,11 @@ public abstract class ProcessStats {
*
* @see Statistics#close
*/
- public final void close() {
+ public void close() {
this.stats.close();
}
- public final Statistics getStatistics() {
+ public Statistics getStatistics() {
return this.stats;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
index 568329b..17f6afe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/stats50/Atomic50StatisticsImpl.java
@@ -135,7 +135,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
////////////////////// Instance Methods //////////////////////
@Override
- public final boolean isAtomic() {
+ public boolean isAtomic() {
return true;
}
@@ -150,13 +150,13 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/**
* Queue of new ThreadStorage instances.
*/
- private final ConcurrentLinkedQueue<ThreadStorage> threadStoreQ =
+ private ConcurrentLinkedQueue<ThreadStorage> threadStoreQ =
new ConcurrentLinkedQueue<ThreadStorage>();
/**
* List of ThreadStorage instances that will be used to roll up stat values on this instance. They
* come from the threadStoreQ.
*/
- private final CopyOnWriteArrayList<ThreadStorage> threadStoreList =
+ private CopyOnWriteArrayList<ThreadStorage> threadStoreList =
new CopyOnWriteArrayList<ThreadStorage>();
/**
@@ -225,17 +225,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
//////////////////////// store() Methods ///////////////////////
@Override
- protected final void _setInt(int offset, int value) {
+ protected void _setInt(int offset, int value) {
doIntWrite(offset, value);
}
@Override
- protected final void _setLong(int offset, long value) {
+ protected void _setLong(int offset, long value) {
doLongWrite(offset, value);
}
@Override
- protected final void _setDouble(int offset, double value) {
+ protected void _setDouble(int offset, double value) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -243,17 +243,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/////////////////////// get() Methods ///////////////////////
@Override
- protected final int _getInt(int offset) {
+ protected int _getInt(int offset) {
return doIntRead(offset);
}
@Override
- protected final long _getLong(int offset) {
+ protected long _getLong(int offset) {
return doLongRead(offset);
}
@Override
- protected final double _getDouble(int offset) {
+ protected double _getDouble(int offset) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -261,19 +261,19 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
//////////////////////// inc() Methods ////////////////////////
@Override
- protected final void _incInt(int offset, int delta) {
+ protected void _incInt(int offset, int delta) {
getThreadIntStorage().getAndAdd(offset, delta);
setIntDirty(offset);
}
@Override
- protected final void _incLong(int offset, long delta) {
+ protected void _incLong(int offset, long delta) {
getThreadLongStorage().getAndAdd(offset, delta);
setLongDirty(offset);
}
@Override
- protected final void _incDouble(int offset, double delta) {
+ protected void _incDouble(int offset, double delta) {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DOUBLE_STATS_NOT_ON_ATOMIC50.toLocalizedString());
}
@@ -355,29 +355,29 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final boolean isIntDirty(final int idx) {
+ private boolean isIntDirty(final int idx) {
return this.intDirty.get(idx) != 0;
}
- private final boolean isLongDirty(final int idx) {
+ private boolean isLongDirty(final int idx) {
return this.longDirty.get(idx) != 0;
}
- private final boolean clearIntDirty(final int idx) {
+ private boolean clearIntDirty(final int idx) {
if (!this.intDirty.weakCompareAndSet(idx, 1/* expected */, 0/* update */)) {
return this.intDirty.compareAndSet(idx, 1/* expected */, 0/* update */);
}
return true;
}
- private final boolean clearLongDirty(final int idx) {
+ private boolean clearLongDirty(final int idx) {
if (!this.longDirty.weakCompareAndSet(idx, 1/* expected */, 0/* update */)) {
return this.longDirty.compareAndSet(idx, 1/* expected */, 0/* update */);
}
return true;
}
- private final void setIntDirty(final int idx) {
+ private void setIntDirty(final int idx) {
if (!this.intDirty.weakCompareAndSet(idx, 0/* expected */, 1/* update */)) {
if (!isIntDirty(idx)) {
this.intDirty.set(idx, 1);
@@ -385,7 +385,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void setLongDirty(final int idx) {
+ private void setLongDirty(final int idx) {
if (!this.longDirty.weakCompareAndSet(idx, 0/* expected */, 1/* update */)) {
if (!isLongDirty(idx)) {
this.longDirty.set(idx, 1);
@@ -393,7 +393,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final int doIntRead(final int idx) {
+ private int doIntRead(final int idx) {
// early out for sampler; it called prepareForSample
if (samplerThread.get() != null) {
return this.intStorage.get(idx);
@@ -423,7 +423,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void doIntWrite(final int idx, int value) {
+ private void doIntWrite(final int idx, int value) {
synchronized (this.intReadPrepLock[idx]) {
if (!isIntDirty(idx)) {
// no need to prepare if not dirty
@@ -444,7 +444,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final long doLongRead(final int idx) {
+ private long doLongRead(final int idx) {
if (samplerThread.get() != null) {
return this.longStorage.get(idx);
}
@@ -473,7 +473,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
}
}
- private final void doLongWrite(int idx, long value) {
+ private void doLongWrite(int idx, long value) {
synchronized (this.longReadPrepLock[idx]) {
if (!isLongDirty(idx)) {
// no need to prepare if not dirty
@@ -497,17 +497,17 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
/////////////////// internal package methods //////////////////
- final int[] _getIntStorage() {
+ int[] _getIntStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
- final long[] _getLongStorage() {
+ long[] _getLongStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
- final double[] _getDoubleStorage() {
+ double[] _getDoubleStorage() {
throw new IllegalStateException(
LocalizedStrings.Atomic50StatisticsImpl_DIRECT_ACCESS_NOT_ON_ATOMIC50.toLocalizedString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
index 1a67f43..216a9d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ByteBufferInputStream.java
@@ -481,7 +481,7 @@ public class ByteBufferInputStream extends InputStream
return this.chunk.getDataSize();
}
- private final int nextGetIndex() {
+ private int nextGetIndex() {
int p = this.position;
if (p >= this.limit) {
throw new BufferUnderflowException();
@@ -490,7 +490,7 @@ public class ByteBufferInputStream extends InputStream
return p;
}
- private final int nextGetIndex(int nb) {
+ private int nextGetIndex(int nb) {
int p = this.position;
if (this.limit - p < nb) {
throw new BufferUnderflowException();
@@ -503,13 +503,13 @@ public class ByteBufferInputStream extends InputStream
* Checks the given index against the limit, throwing an {@link IndexOutOfBoundsException} if it
* is not smaller than the limit or is smaller than zero.
*/
- private final void checkIndex(int i) {
+ private void checkIndex(int i) {
if ((i < 0) || (i >= this.limit)) {
throw new IndexOutOfBoundsException();
}
}
- private final void checkIndex(int i, int nb) {
+ private void checkIndex(int i, int nb) {
if ((i < 0) || (nb > this.limit - i)) {
throw new IndexOutOfBoundsException();
}
@@ -802,14 +802,14 @@ public class ByteBufferInputStream extends InputStream
this.buffer = ByteSourceFactory.create(blob);
}
- public final void setBuffer(ByteSource buffer) {
+ public void setBuffer(ByteSource buffer) {
if (buffer == null) {
throw new NullPointerException();
}
this.buffer = buffer;
}
- public final void setBuffer(ByteBuffer bb) {
+ public void setBuffer(ByteBuffer bb) {
if (bb == null) {
throw new NullPointerException();
}
@@ -821,7 +821,7 @@ public class ByteBufferInputStream extends InputStream
* the wrapped ByteBuffer is done this method throws BufferUnderflowException
*/
@Override
- public final int read() {
+ public int read() {
return (buffer.get() & 0xff);
}
@@ -832,7 +832,7 @@ public class ByteBufferInputStream extends InputStream
* BufferUnderflowException
*/
@Override
- public final int read(byte b[], int off, int len) {
+ public int read(byte b[], int off, int len) {
buffer.get(b, off, len);
return len;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 70868e0..e59821d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -106,7 +106,7 @@ public class Connection implements Runnable {
/** true if connection is a shared resource that can be used by more than one thread */
private boolean sharedResource;
- public final boolean isSharedResource() {
+ public boolean isSharedResource() {
return this.sharedResource;
}
@@ -115,7 +115,7 @@ public class Connection implements Runnable {
private final static ThreadLocal isReaderThread = new ThreadLocal();
- public final static void makeReaderThread() {
+ public static void makeReaderThread() {
// mark this thread as a reader thread
makeReaderThread(true);
}
@@ -125,7 +125,7 @@ public class Connection implements Runnable {
}
// return true if this thread is a reader thread
- public final static boolean isReaderThread() {
+ public static boolean isReaderThread() {
Object o = isReaderThread.get();
if (o == null) {
return false;
@@ -156,7 +156,7 @@ public class Connection implements Runnable {
private final static ThreadLocal isDominoThread = new ThreadLocal();
// return true if this thread is a reader thread
- public final static boolean tipDomino() {
+ public static boolean tipDomino() {
if (DOMINO_THREAD_OWNED_SOCKETS) {
// mark this thread as one who wants to send ALL on TO sockets
ConnectionTable.threadWantsOwnResources();
@@ -167,7 +167,7 @@ public class Connection implements Runnable {
}
}
- public final static boolean isDominoThread() {
+ public static boolean isDominoThread() {
Object o = isDominoThread.get();
if (o == null) {
return false;
@@ -1917,7 +1917,7 @@ public class Connection implements Runnable {
* checks to see if an exception should not be logged: i.e., "forcibly closed", "reset by peer",
* or "connection reset"
*/
- public static final boolean isIgnorableIOException(Exception e) {
+ public static boolean isIgnorableIOException(Exception e) {
if (e instanceof ClosedChannelException) {
return true;
}
@@ -2476,7 +2476,7 @@ public class Connection implements Runnable {
}
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DE_MIGHT_IGNORE")
- final int readFully(InputStream input, byte[] buffer, int len) throws IOException {
+ int readFully(InputStream input, byte[] buffer, int len) throws IOException {
int bytesSoFar = 0;
while (bytesSoFar < len) {
this.owner.getConduit().getCancelCriterion().checkCancelInProgress(null);
@@ -3994,21 +3994,21 @@ public class Connection implements Runnable {
}
- protected final void accessed() {
+ protected void accessed() {
this.accessed = true;
}
/**
* return the DM id of the guy on the other side of this connection.
*/
- public final InternalDistributedMember getRemoteAddress() {
+ public InternalDistributedMember getRemoteAddress() {
return this.remoteAddr;
}
/**
* Return the version of the guy on the other side of this connection.
*/
- public final Version getRemoteVersion() {
+ public Version getRemoteVersion() {
return this.remoteVersion;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
index e85046c..6f405fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgDestreamer.java
@@ -492,7 +492,7 @@ public class MsgDestreamer {
}
@Override
- public final void close() {
+ public void close() {
signalDone();
}
@@ -501,7 +501,7 @@ public class MsgDestreamer {
* the wrapped ByteBuffer is done this method throws BufferUnderflowException
*/
@Override
- public final int read() throws IOException {
+ public int read() throws IOException {
ByteBuffer bb = waitForAvailableData();
// logit("read result=" + result);
return (bb.get() & 0xff);
@@ -514,7 +514,7 @@ public class MsgDestreamer {
* BufferUnderflowException
*/
@Override
- public final int read(byte b[], int off, int len) throws IOException {
+ public int read(byte b[], int off, int len) throws IOException {
ByteBuffer bb = waitForAvailableData();
int remaining = bb.remaining();
int bytesToRead = len;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
index 5c6df46..52c70ff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgOutputStream.java
@@ -44,13 +44,13 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
buffer.put((byte) b);
}
/** override OutputStream's write() */
@Override
- public final void write(byte[] source, int offset, int len) {
+ public void write(byte[] source, int offset, int len) {
this.buffer.put(source, offset, len);
}
@@ -61,13 +61,13 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
/**
* write the header after the message has been written to the stream
*/
- public final void setMessageHeader(int msgType, int processorType, short msgId) {
+ public void setMessageHeader(int msgType, int processorType, short msgId) {
buffer.putInt(Connection.MSG_HEADER_SIZE_OFFSET, Connection.calcHdrSize(size()));
buffer.put(Connection.MSG_HEADER_TYPE_OFFSET, (byte) (msgType & 0xff));
buffer.putShort(Connection.MSG_HEADER_ID_OFFSET, msgId);
}
- public final void reset() {
+ public void reset() {
this.buffer.clear();
this.buffer.position(Connection.MSG_HEADER_BYTES);
}
@@ -76,7 +76,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* gets the content ByteBuffer, ready for reading. The stream should not be written to past this
* point until it has been reset.
*/
- public final ByteBuffer getContentBuffer() {
+ public ByteBuffer getContentBuffer() {
buffer.flip();
return buffer;
}
@@ -92,7 +92,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the boolean to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeBoolean(boolean v) throws IOException {
+ public void writeBoolean(boolean v) throws IOException {
write(v ? 1 : 0);
}
@@ -106,7 +106,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the byte value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeByte(int v) throws IOException {
+ public void writeByte(int v) throws IOException {
write(v);
}
@@ -129,7 +129,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>short</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeShort(int v) throws IOException {
+ public void writeShort(int v) throws IOException {
buffer.putShort((short) v);
}
@@ -152,7 +152,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>char</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeChar(int v) throws IOException {
+ public void writeChar(int v) throws IOException {
buffer.putChar((char) v);
}
@@ -176,7 +176,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>int</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeInt(int v) throws IOException {
+ public void writeInt(int v) throws IOException {
buffer.putInt(v);
}
@@ -204,7 +204,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>long</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeLong(long v) throws IOException {
+ public void writeLong(long v) throws IOException {
buffer.putLong(v);
}
@@ -219,7 +219,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>float</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeFloat(float v) throws IOException {
+ public void writeFloat(float v) throws IOException {
buffer.putFloat(v);
}
@@ -234,7 +234,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param v the <code>double</code> value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeDouble(double v) throws IOException {
+ public void writeDouble(double v) throws IOException {
buffer.putDouble(v);
}
@@ -252,7 +252,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param str the string of bytes to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeBytes(String str) throws IOException {
+ public void writeBytes(String str) throws IOException {
int strlen = str.length();
if (strlen > 0) {
// I know this is a deprecated method but it is PERFECT for this impl.
@@ -283,7 +283,7 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @param s the string value to be written.
* @exception IOException if an I/O error occurs.
*/
- public final void writeChars(String s) throws IOException {
+ public void writeChars(String s) throws IOException {
int len = s.length();
if (len > 0) {
for (int i = 0; i < len; i++) {
@@ -343,11 +343,11 @@ public class MsgOutputStream extends OutputStream implements ObjToByteArraySeria
* @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 {
writeFullUTF(str);
}
- private final void writeFullUTF(String str) throws IOException {
+ private void writeFullUTF(String str) throws IOException {
int strlen = str.length();
if (strlen > 65535) {
throw new UTFDataFormatException(
[11/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
index 8391383..5c2af53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
@@ -15,32 +15,43 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -48,14 +59,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryHeapLongKey
extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -64,10 +94,11 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -87,7 +118,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -98,19 +129,22 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -127,7 +161,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -135,7 +169,9 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -160,7 +196,6 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -200,105 +235,110 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -315,6 +355,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -332,6 +373,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -361,6 +403,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -393,12 +436,15 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -409,5 +455,8 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
index 5861f4a..b04e28e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
@@ -15,32 +15,43 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -48,14 +59,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryHeapObjectKey
extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -64,10 +93,11 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -87,7 +117,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -98,19 +128,22 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -127,7 +160,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -135,7 +168,9 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -160,7 +195,6 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -200,105 +234,110 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -315,6 +354,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -332,6 +372,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -361,6 +402,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -393,13 +435,19 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
index ba12cc6..f0b7c2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
@@ -15,32 +15,43 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -48,10 +59,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryHeapStringKey1
extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -70,9 +96,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -81,10 +109,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -104,7 +133,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -115,19 +144,22 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -144,7 +176,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -152,7 +184,9 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -177,7 +211,6 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -217,105 +250,110 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -332,6 +370,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -349,6 +388,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -378,6 +418,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -410,8 +451,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -425,7 +469,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -444,6 +488,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -473,5 +518,8 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
index 908e6dc..2c93e1b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
@@ -15,24 +15,34 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -40,7 +50,8 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -48,10 +59,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryHeapStringKey2
extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -82,9 +108,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -93,10 +121,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -116,7 +145,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -127,19 +156,22 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -156,7 +188,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -164,7 +196,9 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -189,7 +223,6 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -229,105 +262,110 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -344,6 +382,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -361,6 +400,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -390,6 +430,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -422,8 +463,11 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -442,7 +486,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -472,6 +516,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -514,5 +559,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
index e335e54..9bb28fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
@@ -15,33 +15,45 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,15 +61,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryHeapUUIDKey
extends VersionedThinDiskLRURegionEntryHeap {
public VersionedThinDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -66,10 +97,11 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -89,7 +121,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -100,19 +132,22 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -129,7 +164,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -137,7 +172,9 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -162,7 +199,6 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -202,105 +238,110 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -317,6 +358,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -334,6 +376,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -363,6 +406,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -395,13 +439,16 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -414,5 +461,8 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
index ed76611..8d34730 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,14 +64,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapIntKey
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -68,6 +99,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -99,13 +131,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -121,7 +159,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -145,7 +185,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -156,19 +196,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -185,7 +228,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -193,7 +236,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -218,7 +263,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -258,105 +302,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -373,6 +422,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -390,6 +440,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -419,6 +470,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -451,12 +503,17 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -467,5 +524,8 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
index ae46556..9aa82e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,14 +64,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapLongKey
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -68,6 +99,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -99,13 +131,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -121,7 +159,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -145,7 +185,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -156,19 +196,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -185,7 +228,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -193,7 +236,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -218,7 +263,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -258,105 +302,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -373,6 +422,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -390,6 +440,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -419,6 +470,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -451,12 +503,15 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -467,5 +522,8 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[42/69] [abbrv] geode git commit: GEODE-2934: refactor
AnalyzeSerializablesJUnitTest and subclasses
Posted by ud...@apache.org.
GEODE-2934: refactor AnalyzeSerializablesJUnitTest and subclasses
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9e5c75c1
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9e5c75c1
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9e5c75c1
Branch: refs/heads/feature/GEODE-2580
Commit: 9e5c75c156a5a24fc7512ddaec3877218af1e466
Parents: a547972
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 16 17:53:46 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 17 10:19:09 2017 -0700
----------------------------------------------------------------------
.../apache/geode/internal/lang/SystemUtils.java | 7 +
.../AnalyzeSerializablesJUnitTest.java | 380 +++++++++----------
.../internal/lang/SystemUtilsJUnitTest.java | 4 +
.../AnalyzeCQSerializablesJUnitTest.java | 55 +--
.../AnalyzeWANSerializablesJUnitTest.java | 67 +---
5 files changed, 195 insertions(+), 318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/9e5c75c1/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
index 3485ede..2e47556 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
@@ -301,4 +301,11 @@ public class SystemUtils {
public static String getLineSeparator() {
return LINE_SEPARATOR;
}
+
+ /**
+ * Returns the value of {@code System.getProperty("java.version")}.
+ */
+ public static String getJavaVersion() {
+ return System.getProperty("java.version");
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9e5c75c1/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index 5b78f06..ee61a85 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -14,11 +14,34 @@
*/
package org.apache.geode.codeAnalysis;
-import static org.junit.Assert.fail;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.diffSortedClassesAndMethods;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.diffSortedClassesAndVariables;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.loadClassesAndMethods;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.loadClassesAndVariables;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.parseClassFilesInDir;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.storeClassesAndMethods;
+import static org.apache.geode.codeAnalysis.CompiledClassUtils.storeClassesAndVariables;
+import static org.apache.geode.internal.lang.SystemUtils.getJavaVersion;
+import static org.apache.geode.internal.lang.SystemUtils.isJavaVersionAtLeast;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assume.assumeThat;
+
+import org.apache.geode.codeAnalysis.decode.CompiledClass;
+import org.apache.geode.codeAnalysis.decode.CompiledField;
+import org.apache.geode.codeAnalysis.decode.CompiledMethod;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -26,83 +49,137 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.codeAnalysis.decode.CompiledClass;
-import org.apache.geode.codeAnalysis.decode.CompiledField;
-import org.apache.geode.codeAnalysis.decode.CompiledMethod;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-
@Category(IntegrationTest.class)
public class AnalyzeSerializablesJUnitTest {
/** all loaded classes */
- protected static Map<String, CompiledClass> classes = new HashMap<String, CompiledClass>();
+ private Map<String, CompiledClass> classes;
- private static boolean ClassesNotFound;
+ private List<ClassAndMethodDetails> expectedDataSerializables;
+ private List<ClassAndVariableDetails> expectedSerializables;
+
+ private File actualDataSerializablesFile;
+ private File actualSerializablesFile;
+
+ @Rule
+ public TestName testName = new TestName();
@Before
- public void loadClasses() throws Exception {
- String version = System.getProperty("java.runtime.version");
- boolean jdk18 = version != null && version.startsWith("1.8");
- // sanctioned info is based on a 1.7 compiler
- Assume.assumeTrue(
- "AnalyzeSerializables requires a Java 8 but tests are running with v" + version, jdk18);
- if (classes.size() > 0) {
- return;
+ public void setUp() throws Exception {
+ assumeThat(
+ "AnalyzeSerializables requires Java 8 but tests are running with v" + getJavaVersion(),
+ isJavaVersionAtLeast("1.8"), is(true));
+
+ this.classes = new HashMap<>();
+
+ loadClasses();
+
+ // setup expectedDataSerializables
+
+ File expectedDataSerializablesFile = getResourceAsFile("sanctionedDataSerializables.txt");
+ assertThat(expectedDataSerializablesFile).exists().canRead();
+
+ this.expectedDataSerializables = loadClassesAndMethods(expectedDataSerializablesFile);
+ Collections.sort(this.expectedDataSerializables);
+
+ // setup expectedSerializables
+
+ File expectedSerializablesFile = getResourceAsFile("sanctionedSerializables.txt");
+ assertThat(expectedSerializablesFile).exists().canRead();
+
+ this.expectedSerializables = loadClassesAndVariables(expectedSerializablesFile);
+ Collections.sort(this.expectedSerializables);
+
+ // setup empty actual files
+
+ this.actualDataSerializablesFile = createEmptyFile("actualDataSerializables.dat");
+ this.actualSerializablesFile = createEmptyFile("actualSerializables.dat");
+ }
+
+ /**
+ * Override only this one method in sub-classes
+ */
+ protected String getModuleName() {
+ return "geode-core";
+ }
+
+ @Test
+ public void testDataSerializables() throws Exception {
+ System.out.println(this.testName.getMethodName() + " starting");
+
+ List<ClassAndMethods> actualDataSerializables = findToDatasAndFromDatas();
+ storeClassesAndMethods(actualDataSerializables, this.actualDataSerializablesFile);
+
+ String diff =
+ diffSortedClassesAndMethods(this.expectedDataSerializables, actualDataSerializables);
+ if (diff.length() > 0) {
+ System.out.println(
+ "++++++++++++++++++++++++++++++testDataSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
+ System.out.println(diff);
+ fail(
+ diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
+ + "\norg/apache/geode/codeAnalysis directory. Otherwise if this doesn't "
+ + "\nbreak backward compatibility move the file actualDataSerializables.dat to the codeAnalysis "
+ + "\ntest directory and rename to sanctionedDataSerializables.txt");
}
+ }
+
+ @Test
+ public void testSerializables() throws Exception {
+ System.out.println(this.testName.getMethodName() + " starting");
+
+ List<ClassAndVariables> actualSerializables = findSerializables();
+ storeClassesAndVariables(actualSerializables, this.actualSerializablesFile);
+
+ String diff = diffSortedClassesAndVariables(this.expectedSerializables, actualSerializables);
+ if (diff.length() > 0) {
+ System.out.println(
+ "++++++++++++++++++++++++++++++testSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
+ System.out.println(diff);
+ fail(
+ diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
+ + "\n/org/apache/geode/codeAnalysis/ directory. Otherwise if this doesn't "
+ + "\nbreak backward compatibility move the file actualSerializables.dat to the "
+ + "\ncodeAnalysis test directory and rename to sanctionedSerializables.txt");
+ }
+ }
+
+ private void loadClasses() throws IOException {
System.out.println("loadClasses starting");
- List<String> excludedClasses = loadExcludedClasses(new File(
- TestUtil.getResourcePath(AnalyzeSerializablesJUnitTest.class, "excludedClasses.txt")));
- List<String> openBugs = loadOpenBugs(
- new File(TestUtil.getResourcePath(AnalyzeSerializablesJUnitTest.class, "openBugs.txt")));
+ List<String> excludedClasses = loadExcludedClasses(getResourceAsFile("excludedClasses.txt"));
+ List<String> openBugs = loadOpenBugs(getResourceAsFile("openBugs.txt"));
+
excludedClasses.addAll(openBugs);
- String cp = System.getProperty("java.class.path");
- System.out.println("java classpath is " + cp);
- System.out.flush();
- String[] entries = cp.split(File.pathSeparator);
- String buildDirName = "geode-core" + File.separatorChar + "build" + File.separatorChar
+ String classpath = System.getProperty("java.class.path");
+ System.out.println("java classpath is " + classpath);
+
+ String[] entries = classpath.split(File.pathSeparator);
+ String buildDirName = getModuleName() + File.separatorChar + "build" + File.separatorChar
+ "classes" + File.separatorChar + "main";
String buildDir = null;
for (int i = 0; i < entries.length && buildDir == null; i++) {
System.out.println("examining '" + entries[i] + "'");
- System.out.flush();
if (entries[i].endsWith(buildDirName)) {
buildDir = entries[i];
}
}
- if (buildDir != null) {
- System.out.println("loading class files from " + buildDir);
- System.out.flush();
- long start = System.currentTimeMillis();
- loadClassesFromBuild(new File(buildDir), excludedClasses);
- long finish = System.currentTimeMillis();
- System.out.println("done loading " + classes.size() + " classes. elapsed time = "
- + (finish - start) / 1000 + " seconds");
- } else {
- fail("unable to find geode classes");
- }
- }
- @AfterClass
- public static void cleanup() {
- if (classes != null) {
- classes.clear();
- }
+ assertThat(buildDir).isNotNull();
+ System.out.println("loading class files from " + buildDir);
+
+ long start = System.currentTimeMillis();
+ loadClassesFromBuild(new File(buildDir), excludedClasses);
+ long finish = System.currentTimeMillis();
+
+ System.out.println("done loading " + classes.size() + " classes. elapsed time = "
+ + (finish - start) / 1000 + " seconds");
}
- protected static List<String> loadExcludedClasses(File exclusionsFile) throws Exception {
- List<String> excludedClasses = new LinkedList<String>();
+ private List<String> loadExcludedClasses(File exclusionsFile) throws IOException {
+ List<String> excludedClasses = new LinkedList<>();
FileReader fr = new FileReader(exclusionsFile);
BufferedReader br = new BufferedReader(fr);
try {
@@ -119,8 +196,8 @@ public class AnalyzeSerializablesJUnitTest {
return excludedClasses;
}
- protected static List<String> loadOpenBugs(File exclusionsFile) throws Exception {
- List<String> excludedClasses = new LinkedList<String>();
+ private List<String> loadOpenBugs(File exclusionsFile) throws IOException {
+ List<String> excludedClasses = new LinkedList<>();
FileReader fr = new FileReader(exclusionsFile);
BufferedReader br = new BufferedReader(fr);
try {
@@ -131,7 +208,7 @@ public class AnalyzeSerializablesJUnitTest {
if (line.length() > 0 && !line.startsWith("#")) {
String[] split = line.split(",");
if (split.length != 2) {
- fail("unable to load classes due to misformatted line in openBugs.txt: " + line);
+ fail("unable to load classes due to malformed line in openBugs.txt: " + line);
}
excludedClasses.add(line.split(",")[1].trim());
}
@@ -142,183 +219,78 @@ public class AnalyzeSerializablesJUnitTest {
return excludedClasses;
}
- private static void removeExclusions(Map<String, CompiledClass> classes,
- List<String> exclusions) {
+ private void removeExclusions(Map<String, CompiledClass> classes, List<String> exclusions) {
for (String exclusion : exclusions) {
exclusion = exclusion.replace('.', '/');
classes.remove(exclusion);
}
}
- @Test
- public void testDataSerializables() throws Exception {
- System.out.println("testDataSerializables starting");
- if (ClassesNotFound) {
- System.out.println("... test not run due to not being able to locate product class files");
- return;
- }
- String compareToFileName =
- TestUtil.getResourcePath(getClass(), "sanctionedDataSerializables.txt");
-
- String storeInFileName = "actualDataSerializables.dat";
- File storeInFile = new File(storeInFileName);
- if (storeInFile.exists() && !storeInFile.canWrite()) {
- throw new RuntimeException("can't write " + storeInFileName);
- }
- List<ClassAndMethods> toDatas = findToDatasAndFromDatas();
- CompiledClassUtils.storeClassesAndMethods(toDatas, storeInFile);
-
- File compareToFile = new File(compareToFileName);
- if (!compareToFile.exists()) {
- throw new RuntimeException("can't find " + compareToFileName);
- }
- if (!compareToFile.canRead()) {
- throw new RuntimeException("can't read " + compareToFileName);
- }
-
- List<ClassAndMethodDetails> goldRecord =
- CompiledClassUtils.loadClassesAndMethods(compareToFile);
- Collections.sort(goldRecord);
-
- String diff = CompiledClassUtils.diffSortedClassesAndMethods(goldRecord, toDatas);
- if (diff.length() > 0) {
- System.out.println(
- "++++++++++++++++++++++++++++++testDataSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
- System.out.println(diff);
- fail(
- diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
- + "\norg/apache/geode/codeAnalysis directory. Otherwise if this doesn't "
- + "\nbreak backward compatibility move the file actualDataSerializables.dat to the codeAnalysis "
- + "\ntest directory and rename to sanctionedDataSerializables.txt");
- }
- }
-
- @Test
- public void testSerializables() throws Exception {
- System.out.println("testSerializables starting");
- System.out.flush();
- if (ClassesNotFound) {
- System.out.println("... test not run due to not being able to locate product class files");
- return;
- }
- String compareToFileName = TestUtil.getResourcePath(getClass(), "sanctionedSerializables.txt");
- File compareToFile = new File(compareToFileName);
-
- String storeInFileName = "actualSerializables.dat";
- File storeInFile = new File(storeInFileName);
- if (storeInFile.exists() && !storeInFile.canWrite()) {
- throw new RuntimeException("can't write " + storeInFileName);
- }
-
- List<ClassAndVariables> serializables = findSerializables();
- reset();
- CompiledClassUtils.storeClassesAndVariables(serializables, storeInFile);
-
-
- if (!compareToFile.exists()) {
- throw new RuntimeException("can't find " + compareToFileName);
- }
- if (!compareToFile.canRead()) {
- throw new RuntimeException("can't read " + compareToFileName);
- }
- List<ClassAndVariableDetails> goldRecord =
- CompiledClassUtils.loadClassesAndVariables(compareToFile);
- Collections.sort(goldRecord);
-
- String diff = CompiledClassUtils.diffSortedClassesAndVariables(goldRecord, serializables);
- classes.clear();
- if (diff.length() > 0) {
- System.out.println(
- "++++++++++++++++++++++++++++++testSerializables found discrepencies++++++++++++++++++++++++++++++++++++");
- System.out.println(diff);
- fail(
- diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
- + "\n/org/apache/geode/codeAnalysis/ directory. Otherwise if this doesn't "
- + "\nbreak backward compatibility move the file actualSerializables.dat to the "
- + "\ncodeAnalysis test directory and rename to sanctionedSerializables.txt");
- }
- }
-
- /**
- * load the classes from the given files and directories
- *
- * @param excludedClasses names of classes to exclude
- */
- public static void loadClasses(String directory, boolean recursive,
- List<String> excludedClasses) {
- String[] filenames = new String[] {directory};
- List<File> classFiles = CompiledClassUtils.findClassFiles("", filenames, recursive);
- Map<String, CompiledClass> newClasses = CompiledClassUtils.parseClassFiles(classFiles);
- removeExclusions(newClasses, excludedClasses);
- classes.putAll(newClasses);
- }
-
- public static void loadClassesFromBuild(File buildDir, List<String> excludedClasses) {
- Map<String, CompiledClass> newClasses = CompiledClassUtils.parseClassFilesInDir(buildDir);
+ private void loadClassesFromBuild(File buildDir, List<String> excludedClasses) {
+ Map<String, CompiledClass> newClasses = parseClassFilesInDir(buildDir);
removeExclusions(newClasses, excludedClasses);
- classes.putAll(newClasses);
+ this.classes.putAll(newClasses);
}
- /**
- * load the classes from the given jar file
- */
- public static void loadClasses(File jar, List<String> excludedClasses) {
- Map<String, CompiledClass> newClasses = CompiledClassUtils.parseClassFilesInJar(jar);
- removeExclusions(newClasses, excludedClasses);
- classes.putAll(newClasses);
- }
+ private List<ClassAndMethods> findToDatasAndFromDatas() {
+ List<ClassAndMethods> result = new ArrayList<>();
+ for (Map.Entry<String, CompiledClass> entry : this.classes.entrySet()) {
+ CompiledClass compiledClass = entry.getValue();
+ ClassAndMethods classAndMethods = null;
- /**
- * clears all loaded classes
- */
- public void reset() {
- classes.clear();
- }
+ for (int i = 0; i < compiledClass.methods.length; i++) {
+ CompiledMethod method = compiledClass.methods[i];
- public List<ClassAndMethods> findToDatasAndFromDatas() {
- List<ClassAndMethods> result = new ArrayList<ClassAndMethods>();
- for (Map.Entry<String, CompiledClass> dentry : classes.entrySet()) {
- CompiledClass dclass = dentry.getValue();
- ClassAndMethods entry = null;
- for (int i = 0; i < dclass.methods.length; i++) {
- CompiledMethod method = dclass.methods[i];
if (!method.isAbstract() && method.descriptor().equals("void")) {
String name = method.name();
if (name.startsWith("toData") || name.startsWith("fromData")) {
- if (entry == null) {
- entry = new ClassAndMethods(dclass);
+ if (classAndMethods == null) {
+ classAndMethods = new ClassAndMethods(compiledClass);
}
- entry.methods.put(method.name(), method);
+ classAndMethods.methods.put(method.name(), method);
}
}
}
- if (entry != null) {
- result.add(entry);
+ if (classAndMethods != null) {
+ result.add(classAndMethods);
}
}
Collections.sort(result);
return result;
}
- public List<ClassAndVariables> findSerializables() {
- List<ClassAndVariables> result = new ArrayList<ClassAndVariables>(2000);
- for (Map.Entry<String, CompiledClass> entry : classes.entrySet()) {
- CompiledClass dclass = entry.getValue();
- System.out.println("processing class " + dclass.fullyQualifiedName());
- System.out.flush();
- if (!dclass.isInterface() && dclass.isSerializableAndNotDataSerializable()) {
- ClassAndVariables cav = new ClassAndVariables(dclass);
- for (int i = 0; i < dclass.fields_count; i++) {
- CompiledField f = dclass.fields[i];
- if (!f.isStatic() && !f.isTransient()) {
- cav.variables.put(f.name(), f);
+ private List<ClassAndVariables> findSerializables() {
+ List<ClassAndVariables> result = new ArrayList<>(2000);
+ for (Map.Entry<String, CompiledClass> entry : this.classes.entrySet()) {
+ CompiledClass compiledClass = entry.getValue();
+ System.out.println("processing class " + compiledClass.fullyQualifiedName());
+
+ if (!compiledClass.isInterface() && compiledClass.isSerializableAndNotDataSerializable()) {
+ ClassAndVariables classAndVariables = new ClassAndVariables(compiledClass);
+ for (int i = 0; i < compiledClass.fields_count; i++) {
+ CompiledField compiledField = compiledClass.fields[i];
+ if (!compiledField.isStatic() && !compiledField.isTransient()) {
+ classAndVariables.variables.put(compiledField.name(), compiledField);
}
}
- result.add(cav);
+ result.add(classAndVariables);
}
}
Collections.sort(result);
return result;
}
+ private File createEmptyFile(String fileName) throws IOException {
+ File file = new File(fileName);
+ if (file.exists()) {
+ assertThat(file.delete()).isTrue();
+ }
+ assertThat(file.createNewFile()).isTrue();
+ assertThat(file).exists().canWrite();
+ return file;
+ }
+
+ private File getResourceAsFile(String resourceName) {
+ return new File(getClass().getResource(resourceName).getFile());
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9e5c75c1/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 8a83dc0..5e669b3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -137,4 +137,8 @@ public class SystemUtilsJUnitTest {
assertThat(getBootClassPath()).isEqualTo(value);
}
+ @Test
+ public void getJavaVersionShouldReturnJavaVersionValue() {
+ assertThat(getJavaVersion()).isEqualTo(System.getProperty("java.version"));
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9e5c75c1/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index 747dd8b..4ba17e0 100755
--- a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -14,61 +14,14 @@
*/
package org.apache.geode.codeAnalysis;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
+import org.junit.experimental.categories.Category;
-/**
- *
- */
@Category(IntegrationTest.class)
public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
- @Before
- public void loadClasses() throws Exception {
- if (classes.size() > 0) {
- return;
- }
- System.out.println("loadClasses starting");
- List<String> excludedClasses = loadExcludedClasses(new File(
- TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
- List<String> openBugs = loadOpenBugs(
- new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
- excludedClasses.addAll(openBugs);
-
- String cp = System.getProperty("java.class.path");
- System.out.println("java classpath is " + cp);
- System.out.flush();
- String[] entries = cp.split(File.pathSeparator);
- String buildDirName = "geode-cq" + File.separatorChar + "build" + File.separatorChar + "classes"
- + File.separatorChar + "main";
- String buildDir = null;
-
- for (int i = 0; i < entries.length && buildDir == null; i++) {
- System.out.println("examining '" + entries[i] + "'");
- System.out.flush();
- if (entries[i].endsWith(buildDirName)) {
- buildDir = entries[i];
- }
- }
- if (buildDir != null) {
- System.out.println("loading class files from " + buildDir);
- System.out.flush();
- long start = System.currentTimeMillis();
- loadClassesFromBuild(new File(buildDir), excludedClasses);
- long finish = System.currentTimeMillis();
- System.out.println("done loading " + classes.size() + " classes. elapsed time = "
- + (finish - start) / 1000 + " seconds");
- } else {
- fail("unable to find CQ classes");
- }
+ @Override
+ protected String getModuleName() {
+ return "geode-cq";
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9e5c75c1/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
index 77c541c..5098131 100755
--- a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -14,73 +14,14 @@
*/
package org.apache.geode.codeAnalysis;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.codeAnalysis.decode.CompiledClass;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
+import org.junit.experimental.categories.Category;
-/**
- *
- */
@Category(IntegrationTest.class)
public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
- @Before
- public void loadClasses() throws Exception {
- if (classes.size() > 0) {
- return;
- }
- System.out.println("loadClasses starting");
- List<String> excludedClasses = loadExcludedClasses(new File(
- TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "excludedClasses.txt")));
- List<String> openBugs = loadOpenBugs(
- new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "openBugs.txt")));
- excludedClasses.addAll(openBugs);
-
- String cp = System.getProperty("java.class.path");
- System.out.println("java classpath is " + cp);
- System.out.flush();
- String[] entries = cp.split(File.pathSeparator);
- String buildDirName = "geode-wan" + File.separatorChar + "build" + File.separatorChar
- + "classes" + File.separatorChar + "main";
- String buildDir = null;
-
- for (int i = 0; i < entries.length && buildDir == null; i++) {
- System.out.println("examining '" + entries[i] + "'");
- System.out.flush();
- if (entries[i].endsWith(buildDirName)) {
- buildDir = entries[i];
- }
- }
- if (buildDir != null) {
- System.out.println("loading class files from " + buildDir);
- System.out.flush();
- long start = System.currentTimeMillis();
- loadClassesFromBuild(new File(buildDir), excludedClasses);
- long finish = System.currentTimeMillis();
- System.out.println("done loading " + classes.size() + " classes. elapsed time = "
- + (finish - start) / 1000 + " seconds");
- } else {
- fail("unable to find WAN classes");
- }
+ @Override
+ protected String getModuleName() {
+ return "geode-wan";
}
-
- @AfterClass
- public static void cleanup() {
- if (classes != null) {
- classes.clear();
- }
- }
-
}
[62/69] [abbrv] geode git commit: GEODE-2929: remove superfluous
final from methods
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 1700ccd..ea3f8d6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -95,7 +95,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest
}
}
- private final void getAvailableCacheElseCreateCache() {
+ private void getAvailableCacheElseCreateCache() {
synchronized (ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.class) {
try {
Cache newCache = GemFireCacheImpl.getInstance();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java
index cfd75ba..5a5c80d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java
@@ -49,7 +49,7 @@ public abstract class CacheSerializableRunnable extends SerializableRunnable
* Invokes the {@link #run2} method and will wrap any {@link CacheException} thrown by
* <code>run2</code> in a {@link CacheSerializableRunnableException}.
*/
- public final void run() {
+ public void run() {
try {
if (args == null) {
run2();
@@ -68,7 +68,7 @@ public abstract class CacheSerializableRunnable extends SerializableRunnable
* repeat the {@link #run} method until it either succeeds or repeatTimeoutMs milliseconds have
* passed. The AssertionError is only thrown to the caller if the last run still throws it.
*/
- public final void runRepeatingIfNecessary(long repeatTimeoutMs) {
+ public void runRepeatingIfNecessary(long repeatTimeoutMs) {
long start = System.currentTimeMillis();
AssertionError lastErr = null;
do {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
index db92dc8..3b56748 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
@@ -124,12 +124,12 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
*
* @see #getRegionAttributes
*/
- protected final Region createRegion(String name) throws CacheException {
+ protected Region createRegion(String name) throws CacheException {
return createRegion(name, getRegionAttributes());
}
- protected final Region createRootRegion() throws CacheException {
+ protected Region createRootRegion() throws CacheException {
return createRootRegion(getRegionAttributes());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
index c8a629c..e801392 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
@@ -399,7 +399,7 @@ public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
rgn2.destroyRegion();
}
- static final void setInternalCallbacks(TXStateInterface txp, final byte[] cbSensors) {
+ static void setInternalCallbacks(TXStateInterface txp, final byte[] cbSensors) {
((TXStateProxyImpl) txp).forceLocalBootstrap();
TXState tx = (TXState) ((TXStateProxyImpl) txp).getRealDeal(null, null);
assertEquals(9, cbSensors.length);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
index 37f67e8..3004ea8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
@@ -77,7 +77,7 @@ public abstract class TestCacheCallback implements CacheCallback {
return this.isClosed;
}
- public final void close() {
+ public void close() {
this.isClosed = true;
close2();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
index db318d5..b7f811a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
@@ -86,7 +86,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
}
}
- public final void afterCreate(EntryEvent event) {
+ public void afterCreate(EntryEvent event) {
addEvent(event);
try {
afterCreate2(event);
@@ -103,7 +103,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
throw new UnsupportedOperationException(s);
}
- public final void afterUpdate(EntryEvent event) {
+ public void afterUpdate(EntryEvent event) {
addEvent(event);
try {
afterUpdate2(event);
@@ -120,7 +120,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
throw new UnsupportedOperationException(s);
}
- public final void afterInvalidate(EntryEvent event) {
+ public void afterInvalidate(EntryEvent event) {
addEvent(event);
try {
afterInvalidate2(event);
@@ -137,7 +137,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
throw new UnsupportedOperationException(s);
}
- public final void afterDestroy(EntryEvent event) {
+ public void afterDestroy(EntryEvent event) {
afterDestroyBeforeAddEvent(event);
addEvent(event);
try {
@@ -159,7 +159,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
throw new UnsupportedOperationException(s);
}
- public final void afterRegionInvalidate(RegionEvent event) {
+ public void afterRegionInvalidate(RegionEvent event) {
addEvent(event);
try {
afterRegionInvalidate2(event);
@@ -176,7 +176,7 @@ public abstract class TestCacheListener extends TestCacheCallback implements Cac
throw new UnsupportedOperationException(s);
}
- public final void afterRegionDestroy(RegionEvent event) {
+ public void afterRegionDestroy(RegionEvent event) {
// check argument to see if this is during tearDown
if ("teardown".equals(event.getCallbackArgument()))
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
index d9158a5..8f91515 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.*;
*/
public abstract class TestCacheLoader extends TestCacheCallback implements CacheLoader {
- public final Object load(LoaderHelper helper) throws CacheLoaderException {
+ public Object load(LoaderHelper helper) throws CacheLoaderException {
this.invoked = true;
return load2(helper);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
index 95d7f75..ea1ed1a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
@@ -29,7 +29,7 @@ import org.apache.geode.cache.*;
public abstract class TestCacheWriter extends TestCacheCallback implements CacheWriter {
- public final void beforeUpdate(EntryEvent event) throws CacheWriterException {
+ public void beforeUpdate(EntryEvent event) throws CacheWriterException {
this.invoked = true;
beforeUpdate2(event);
@@ -41,13 +41,13 @@ public abstract class TestCacheWriter extends TestCacheCallback implements Cache
throw new UnsupportedOperationException(s);
}
- public final void beforeUpdate2(EntryEvent event, Object arg) throws CacheWriterException {
+ public void beforeUpdate2(EntryEvent event, Object arg) throws CacheWriterException {
String s = "Shouldn't be invoked";
throw new UnsupportedOperationException(s);
}
- public final void beforeCreate(EntryEvent event) throws CacheWriterException {
+ public void beforeCreate(EntryEvent event) throws CacheWriterException {
this.invoked = true;
beforeCreate2(event);
@@ -62,13 +62,13 @@ public abstract class TestCacheWriter extends TestCacheCallback implements Cache
/**
* Causes code that uses the old API to not compile
*/
- public final void beforeCreate2(EntryEvent event, Object arg) throws CacheWriterException {
+ public void beforeCreate2(EntryEvent event, Object arg) throws CacheWriterException {
String s = "Shouldn't be invoked";
throw new UnsupportedOperationException(s);
}
- public final void beforeDestroy(EntryEvent event) throws CacheWriterException {
+ public void beforeDestroy(EntryEvent event) throws CacheWriterException {
this.invoked = true;
beforeDestroy2(event);
@@ -80,13 +80,13 @@ public abstract class TestCacheWriter extends TestCacheCallback implements Cache
throw new UnsupportedOperationException(s);
}
- public final void beforeDestroy2(EntryEvent event, Object arg) throws CacheWriterException {
+ public void beforeDestroy2(EntryEvent event, Object arg) throws CacheWriterException {
String s = "Shouldn't be invoked";
throw new UnsupportedOperationException(s);
}
- public final void beforeRegionDestroy(RegionEvent event) throws CacheWriterException {
+ public void beforeRegionDestroy(RegionEvent event) throws CacheWriterException {
// check argument to see if this is during tearDown
if ("teardown".equals(event.getCallbackArgument()))
@@ -102,14 +102,13 @@ public abstract class TestCacheWriter extends TestCacheCallback implements Cache
throw new UnsupportedOperationException(s);
}
- public final void beforeRegionDestroy2(RegionEvent event, Object arg)
- throws CacheWriterException {
+ public void beforeRegionDestroy2(RegionEvent event, Object arg) throws CacheWriterException {
String s = "Shouldn't be invoked";
throw new UnsupportedOperationException(s);
}
- public final void beforeRegionClear(RegionEvent event) throws CacheWriterException {
+ public void beforeRegionClear(RegionEvent event) throws CacheWriterException {
String s = "Unexpected callback invocation";
throw new UnsupportedOperationException(s);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java b/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
index 2b75ccc..d29cb3c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
@@ -28,7 +28,7 @@ import org.apache.geode.cache.*;
public abstract class TestTransactionListener extends TestCacheCallback
implements TransactionListener {
- public final void afterCommit(TransactionEvent event) {
+ public void afterCommit(TransactionEvent event) {
this.invoked = true;
try {
afterCommit2(event);
@@ -45,7 +45,7 @@ public abstract class TestTransactionListener extends TestCacheCallback
throw new UnsupportedOperationException(s);
}
- public final void afterFailedCommit(TransactionEvent event) {
+ public void afterFailedCommit(TransactionEvent event) {
this.invoked = true;
try {
afterFailedCommit2(event);
@@ -63,7 +63,7 @@ public abstract class TestTransactionListener extends TestCacheCallback
}
- public final void afterRollback(TransactionEvent event) {
+ public void afterRollback(TransactionEvent event) {
this.invoked = true;
try {
afterRollback2(event);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index 416b459..46d51e8 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -20,6 +20,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import org.apache.commons.lang.StringUtils;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -50,6 +53,13 @@ public class AbstractLauncherTest {
}
@Test
+ public void shouldBeMockable() throws Exception {
+ AbstractLauncher mockAbstractLauncher = mock(AbstractLauncher.class);
+ mockAbstractLauncher.setDebug(true);
+ verify(mockAbstractLauncher, times(1)).setDebug(true);
+ }
+
+ @Test
public void testIsSet() {
final Properties properties = new Properties();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/AbstractLocatorLauncherRemoteIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLocatorLauncherRemoteIntegrationTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLocatorLauncherRemoteIntegrationTestCase.java
index 2a6dfa6..4117d25 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLocatorLauncherRemoteIntegrationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLocatorLauncherRemoteIntegrationTestCase.java
@@ -58,7 +58,7 @@ public abstract class AbstractLocatorLauncherRemoteIntegrationTestCase
/**
* Remove final if a test needs to override.
*/
- protected final AbstractLauncher.Status getExpectedStopStatusForNotRunning() {
+ protected AbstractLauncher.Status getExpectedStopStatusForNotRunning() {
return AbstractLauncher.Status.NOT_RESPONDING;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/AbstractServerLauncherRemoteIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractServerLauncherRemoteIntegrationTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractServerLauncherRemoteIntegrationTestCase.java
index d3aa05b..b50b77a 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractServerLauncherRemoteIntegrationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractServerLauncherRemoteIntegrationTestCase.java
@@ -62,7 +62,7 @@ public abstract class AbstractServerLauncherRemoteIntegrationTestCase
/**
* Remove final if a test needs to override.
*/
- protected final AbstractLauncher.Status getExpectedStopStatusForNotRunning() {
+ protected AbstractLauncher.Status getExpectedStopStatusForNotRunning() {
return AbstractLauncher.Status.NOT_RESPONDING;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
index 50cea4d..0281a37 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -21,15 +21,16 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -40,7 +41,6 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import joptsimple.OptionException;
-
/**
* The LocatorLauncherTest class is a test suite of test cases for testing the contract and
* functionality of launching a GemFire Locator.
@@ -61,9 +61,16 @@ public class LocatorLauncherTest {
@Rule
public final TestName testName = new TestName();
- @Before
- public void setup() {
- DistributedSystem.removeSystem(InternalDistributedSystem.getConnectedInstance());
+ @Test
+ public void shouldBeMockable() throws Exception {
+ LocatorLauncher mockLocatorLauncher = mock(LocatorLauncher.class);
+ InternalLocator mockInternalLocator = mock(InternalLocator.class);
+
+ when(mockLocatorLauncher.getLocator()).thenReturn(mockInternalLocator);
+ when(mockLocatorLauncher.getId()).thenReturn("ID");
+
+ assertThat(mockLocatorLauncher.getLocator()).isSameAs(mockInternalLocator);
+ assertThat(mockLocatorLauncher.getId()).isEqualTo("ID");
}
@Test(expected = IllegalArgumentException.class)
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index 98f73d8..9611e32 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -15,12 +15,18 @@
package org.apache.geode.distributed;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
@@ -29,6 +35,7 @@ import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.support.DistributedSystemAdapter;
+import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -93,6 +100,29 @@ public class ServerLauncherTest {
}
@Test
+ public void shouldBeMockable() throws Exception {
+ ServerLauncher mockServerLauncher = mock(ServerLauncher.class);
+ Cache mockCache = mock(Cache.class);
+ CacheConfig mockCacheConfig = mock(CacheConfig.class);
+
+ when(mockServerLauncher.getCache()).thenReturn(mockCache);
+ when(mockServerLauncher.getCacheConfig()).thenReturn(mockCacheConfig);
+ when(mockServerLauncher.getId()).thenReturn("ID");
+ when(mockServerLauncher.isWaiting(eq(mockCache))).thenReturn(true);
+ when(mockServerLauncher.isHelping()).thenReturn(true);
+
+ mockServerLauncher.startCacheServer(mockCache);
+
+ verify(mockServerLauncher, times(1)).startCacheServer(mockCache);
+
+ assertThat(mockServerLauncher.getCache()).isSameAs(mockCache);
+ assertThat(mockServerLauncher.getCacheConfig()).isSameAs(mockCacheConfig);
+ assertThat(mockServerLauncher.getId()).isSameAs("ID");
+ assertThat(mockServerLauncher.isWaiting(mockCache)).isTrue();
+ assertThat(mockServerLauncher.isHelping()).isTrue();
+ }
+
+ @Test
public void testParseCommand() {
Builder builder = new Builder();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
new file mode 100644
index 0000000..ab5124a
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed.internal;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributionAdvisorTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributionAdvisor mockDistributionAdvisor = mock(DistributionAdvisor.class);
+ mockDistributionAdvisor.initialize();
+ verify(mockDistributionAdvisor, times(1)).initialize();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
new file mode 100644
index 0000000..5e37c18
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.concurrent.Executor;
+
+@Category(UnitTest.class)
+public class DistributionManagerTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+ Executor mockExecutor = mock(Executor.class);
+ when(mockDistributionManager.getExecutor(anyInt(), eq(mockInternalDistributedMember)))
+ .thenReturn(mockExecutor);
+ assertThat(mockDistributionManager.getExecutor(1, mockInternalDistributedMember))
+ .isSameAs(mockExecutor);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
new file mode 100644
index 0000000..df6e7c5
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed.internal;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributionMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributionMessage mockDistributionMessage = mock(DistributionMessage.class);
+ ReplySender mockReplySender = mock(ReplySender.class);
+
+ mockDistributionMessage.setReplySender(mockReplySender);
+
+ verify(mockDistributionMessage, times(1)).setReplySender(mockReplySender);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
new file mode 100644
index 0000000..224e845
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed.internal;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ReplyProcessor21Test {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ReplyProcessor21 mockReplyProcessor21 = mock(ReplyProcessor21.class);
+
+ mockReplyProcessor21.waitForRepliesUninterruptibly();
+ mockReplyProcessor21.finished();
+
+ verify(mockReplyProcessor21, times(1)).waitForRepliesUninterruptibly();
+ verify(mockReplyProcessor21, times(1)).finished();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
new file mode 100644
index 0000000..88105d3
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractConfigTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractConfig mockAbstractConfig = mock(AbstractConfig.class);
+ when(mockAbstractConfig.toString()).thenReturn("STRING");
+ assertThat(mockAbstractConfig.toString()).isEqualTo("STRING");
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 2f853db..12e20c7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -3283,7 +3283,7 @@ public class DataSerializableJUnitTest implements Serializable {
}
@Override
- public final void newDataSerializer(DataSerializer ds) {
+ public void newDataSerializer(DataSerializer ds) {
this.invoked = true;
try {
newDataSerializer2(ds);
@@ -3302,7 +3302,7 @@ public class DataSerializableJUnitTest implements Serializable {
}
@Override
- public final void newInstantiator(Instantiator instantiator) {
+ public void newInstantiator(Instantiator instantiator) {
this.invoked = true;
try {
newInstantiator2(instantiator);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
new file mode 100644
index 0000000..fa79ff2
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class HeapDataOutputStreamTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ HeapDataOutputStream mockHeapDataOutputStream = mock(HeapDataOutputStream.class);
+ Version mockVersion = mock(Version.class);
+ when(mockHeapDataOutputStream.getVersion()).thenReturn(mockVersion);
+ assertThat(mockHeapDataOutputStream.getVersion()).isEqualTo(mockVersion);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
new file mode 100644
index 0000000..4d9f480
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ObjIdConcurrentMapTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ObjIdConcurrentMap mockObjIdConcurrentMap = mock(ObjIdConcurrentMap.class);
+ Segment mockSegment = mock(Segment.class);
+
+ when(mockObjIdConcurrentMap.segmentFor(anyInt())).thenReturn(mockSegment);
+
+ assertThat(mockObjIdConcurrentMap.segmentFor(0)).isEqualTo(mockSegment);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
new file mode 100644
index 0000000..d994fe9
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractDiskRegionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractDiskRegion mockAbstractDiskRegion = mock(AbstractDiskRegion.class);
+ DiskStoreImpl mockDiskStoreImpl = mock(DiskStoreImpl.class);
+ DiskId mockDiskId = mock(DiskId.class);
+ Object object = new Object();
+
+ when(mockAbstractDiskRegion.getDiskStore()).thenReturn(mockDiskStoreImpl);
+ when(mockAbstractDiskRegion.getRaw(eq(mockDiskId))).thenReturn(object);
+
+ assertThat(mockAbstractDiskRegion.getDiskStore()).isEqualTo(mockDiskStoreImpl);
+ assertThat(mockAbstractDiskRegion.getRaw(mockDiskId)).isEqualTo(object);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
new file mode 100644
index 0000000..abead95
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractLRURegionMapTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractLRURegionMapTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractLRURegionMap mockAbstractLRURegionMap = mock(AbstractLRURegionMap.class);
+
+ when(mockAbstractLRURegionMap.centralizedLruUpdateCallback()).thenReturn(1);
+
+ mockAbstractLRURegionMap.audit();
+ mockAbstractLRURegionMap.changeTotalEntrySize(1);
+
+ verify(mockAbstractLRURegionMap, times(1)).audit();
+ verify(mockAbstractLRURegionMap, times(1)).changeTotalEntrySize(1);
+
+ assertThat(mockAbstractLRURegionMap.centralizedLruUpdateCallback()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
new file mode 100644
index 0000000..5043f09
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractOplogDiskRegionEntryTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractOplogDiskRegionEntry mockAbstractOplogDiskRegionEntry =
+ mock(AbstractOplogDiskRegionEntry.class);
+ LocalRegion mockLocalRegion = mock(LocalRegion.class);
+
+ mockAbstractOplogDiskRegionEntry.removePhase1(mockLocalRegion, true);
+
+ verify(mockAbstractOplogDiskRegionEntry, times(1)).removePhase1(mockLocalRegion, true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index eee588e..60b93a9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -14,21 +14,46 @@
*/
package org.apache.geode.internal.cache;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Operation;
+import org.apache.geode.internal.cache.versions.VersionHolder;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
@Category(UnitTest.class)
public class AbstractRegionMapTest {
@Test
+ public void shouldBeMockable() throws Exception {
+ AbstractRegionMap mockAbstractRegionMap = mock(AbstractRegionMap.class);
+ RegionEntry mockRegionEntry = mock(RegionEntry.class);
+ VersionHolder mockVersionHolder = mock(VersionHolder.class);
+
+ when(mockAbstractRegionMap.removeTombstone(eq(mockRegionEntry), eq(mockVersionHolder),
+ anyBoolean(), anyBoolean())).thenReturn(true);
+
+ assertThat(
+ mockAbstractRegionMap.removeTombstone(mockRegionEntry, mockVersionHolder, true, true))
+ .isTrue();
+ }
+
+ @Test
public void invalidateOfNonExistentRegionThrowsEntryNotFound() {
TestableAbstractRegionMap arm = new TestableAbstractRegionMap();
EntryEventImpl event = createEventForInvalidate(arm.owner);
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
new file mode 100644
index 0000000..adbfa02
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class AbstractRegionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ AbstractRegion mockAbstractRegion = mock(AbstractRegion.class);
+ long millis = System.currentTimeMillis();
+
+ when(mockAbstractRegion.isAllEvents()).thenReturn(true);
+ when(mockAbstractRegion.cacheTimeMillis()).thenReturn(millis);
+
+ assertThat(mockAbstractRegion.isAllEvents()).isTrue();
+ assertThat(mockAbstractRegion.cacheTimeMillis()).isEqualTo(millis);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
new file mode 100644
index 0000000..2b17f36
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class BucketAdvisorTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ BucketAdvisor mockBucketAdvisor = mock(BucketAdvisor.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+
+ when(mockBucketAdvisor.basicGetPrimaryMember()).thenReturn(mockInternalDistributedMember);
+ when(mockBucketAdvisor.getBucketRedundancy()).thenReturn(1);
+
+ assertThat(mockBucketAdvisor.basicGetPrimaryMember()).isEqualTo(mockInternalDistributedMember);
+ assertThat(mockBucketAdvisor.getBucketRedundancy()).isEqualTo(1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
index 3d0be6a..5718055 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug37377DUnitTest.java
@@ -267,11 +267,11 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase {
private static RegionEntryFactory factory = new RegionEntryFactory() {
- public final RegionEntry createEntry(RegionEntryContext r, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext r, Object key, Object value) {
return new TestAbstractDiskRegionEntry(r, key, value);
}
- public final Class getEntryClass() {
+ public Class getEntryClass() {
return TestAbstractDiskRegionEntry.class;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
index 6dc52ba..1a4e51e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug39079DUnitTest.java
@@ -305,12 +305,12 @@ public class Bug39079DUnitTest extends JUnit4CacheTestCase {
private static RegionEntryFactory factory = new RegionEntryFactory() {
@Override
- public final RegionEntry createEntry(RegionEntryContext r, Object key, Object value) {
+ public RegionEntry createEntry(RegionEntryContext r, Object key, Object value) {
throw new DiskAccessException(new IOException("Test Exception"));
}
@Override
- public final Class getEntryClass() {
+ public Class getEntryClass() {
return getClass();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
new file mode 100644
index 0000000..3e60ef2
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class CacheOperationMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ CacheOperationMessage mockCacheOperationMessage = mock(CacheOperationMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+
+ when(mockCacheOperationMessage.supportsDirectAck()).thenReturn(true);
+ when(mockCacheOperationMessage._mayAddToMultipleSerialGateways(eq(mockDistributionManager)))
+ .thenReturn(true);
+
+ mockCacheOperationMessage.process(mockDistributionManager);
+
+ verify(mockCacheOperationMessage, times(1)).process(mockDistributionManager);
+
+ assertThat(mockCacheOperationMessage.supportsDirectAck()).isTrue();
+ assertThat(mockCacheOperationMessage._mayAddToMultipleSerialGateways(mockDistributionManager))
+ .isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
new file mode 100644
index 0000000..8ffbdaf
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DestroyMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DestroyMessage mockDestroyOperation = mock(DestroyMessage.class);
+ DistributedRegion mockDistributedRegion = mock(DistributedRegion.class);
+ InternalCacheEvent mockInternalCacheEvent = mock(InternalCacheEvent.class);
+
+ when(mockDestroyOperation.createEvent(eq(mockDistributedRegion)))
+ .thenReturn(mockInternalCacheEvent);
+
+ assertThat(mockDestroyOperation.createEvent(mockDistributedRegion))
+ .isEqualTo(mockInternalCacheEvent);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
index dd29c74..81747f1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -240,7 +240,7 @@ public class DiskRegCacheXmlJUnitTest {
}
/** Close the cache */
- private synchronized final void closeCache() {
+ private synchronized void closeCache() {
if (cache != null) {
try {
if (!cache.isClosed()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
index 63e6d62..8a99972 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
@@ -120,7 +120,7 @@ public class DiskRegionClearJUnitTest {
}
/** Close the cache */
- private static synchronized final void closeCache() {
+ private static synchronized void closeCache() {
if (cache != null) {
try {
if (!cache.isClosed()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
index 913d56d..2d3ac3a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
@@ -175,7 +175,7 @@ public abstract class DiskRegionTestingBase {
}
/** Close the cache */
- private static synchronized final void closeCache() {
+ private static synchronized void closeCache() {
if (cache != null) {
try {
if (!cache.isClosed()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
new file mode 100644
index 0000000..f2806fe
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+
+@Category(UnitTest.class)
+public class DistPeerTXStateStubTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistPeerTXStateStub mockDistPeerTXStateStub = mock(DistPeerTXStateStub.class);
+ DistTxEntryEvent mockDistTxEntryEvent = mock(DistTxEntryEvent.class);
+ ArrayList<DistTxEntryEvent> arrayOfDistTxEntryEvents = new ArrayList<>();
+ arrayOfDistTxEntryEvents.add(mockDistTxEntryEvent);
+
+ when(mockDistPeerTXStateStub.getPrimaryTransactionalOperations())
+ .thenReturn(arrayOfDistTxEntryEvents);
+
+ assertThat(mockDistPeerTXStateStub.getPrimaryTransactionalOperations())
+ .isSameAs(arrayOfDistTxEntryEvents);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
new file mode 100644
index 0000000..cba7c98
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
+import org.apache.geode.internal.cache.persistence.PersistentMemberID;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Category(UnitTest.class)
+public class DistributedCacheOperationTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributedCacheOperation mockDistributedCacheOperation = mock(DistributedCacheOperation.class);
+ CacheOperationMessage mockCacheOperationMessage = mock(CacheOperationMessage.class);
+ Map<InternalDistributedMember, PersistentMemberID> persistentIds = new HashMap<>();
+ when(mockDistributedCacheOperation.supportsDirectAck()).thenReturn(false);
+
+ mockDistributedCacheOperation.waitForAckIfNeeded(mockCacheOperationMessage, persistentIds);
+
+ verify(mockDistributedCacheOperation, times(1)).waitForAckIfNeeded(mockCacheOperationMessage,
+ persistentIds);
+
+ assertThat(mockDistributedCacheOperation.supportsDirectAck()).isFalse();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
new file mode 100644
index 0000000..3d60475
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributedPutAllOperationTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributedPutAllOperation mockDistributedPutAllOperation =
+ mock(DistributedPutAllOperation.class);
+ EntryEventImpl mockEntryEventImpl = mock(EntryEventImpl.class);
+
+ when(mockDistributedPutAllOperation.getBaseEvent()).thenReturn(mockEntryEventImpl);
+
+ assertThat(mockDistributedPutAllOperation.getBaseEvent()).isSameAs(mockEntryEventImpl);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
new file mode 100644
index 0000000..7c6aebc
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributedRegionFunctionStreamingMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributedRegionFunctionStreamingMessage mockDistributedRegionFunctionStreamingMessage =
+ mock(DistributedRegionFunctionStreamingMessage.class);
+ DistributionManager mockDistributionManager = mock(DistributionManager.class);
+ DistributedRegion mockDistributedRegion = mock(DistributedRegion.class);
+
+ when(mockDistributedRegionFunctionStreamingMessage
+ .operateOnDistributedRegion(eq(mockDistributionManager), eq(mockDistributedRegion)))
+ .thenReturn(true);
+
+ assertThat(mockDistributedRegionFunctionStreamingMessage
+ .operateOnDistributedRegion(mockDistributionManager, mockDistributedRegion)).isTrue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
new file mode 100644
index 0000000..67b0c6c
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributedRegionTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributedRegion mockDistributedRegion = mock(DistributedRegion.class);
+ EntryEventImpl mockEntryEventImpl = mock(EntryEventImpl.class);
+ Object returnValue = new Object();
+
+ when(mockDistributedRegion.validatedDestroy(anyObject(), eq(mockEntryEventImpl)))
+ .thenReturn(returnValue);
+
+ assertThat(mockDistributedRegion.validatedDestroy(new Object(), mockEntryEventImpl))
+ .isSameAs(returnValue);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
new file mode 100644
index 0000000..42780db
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class DistributedRemoveAllOperationTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ DistributedRemoveAllOperation mockDistributedRemoveAllOperation =
+ mock(DistributedRemoveAllOperation.class);
+ EntryEventImpl mockEntryEventImpl = mock(EntryEventImpl.class);
+
+ when(mockDistributedRemoveAllOperation.getBaseEvent()).thenReturn(mockEntryEventImpl);
+
+ assertThat(mockDistributedRemoveAllOperation.getBaseEvent()).isSameAs(mockEntryEventImpl);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
new file mode 100644
index 0000000..4bcebda
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class ExpiryTaskTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ ExpiryTask mockExpiryTask = mock(ExpiryTask.class);
+ mockExpiryTask.run2();
+ verify(mockExpiryTask, times(1)).run2();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index a24fc5a..d867959 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@@ -22,6 +23,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,6 +40,17 @@ import org.apache.geode.test.junit.categories.UnitTest;
public class GemFireCacheImplTest {
@Test
+ public void shouldBeMockable() throws Exception {
+ GemFireCacheImpl mockGemFireCacheImpl = mock(GemFireCacheImpl.class);
+ InternalResourceManager mockInternalResourceManager = mock(InternalResourceManager.class);
+
+ when(mockGemFireCacheImpl.getInternalResourceManager()).thenReturn(mockInternalResourceManager);
+
+ assertThat(mockGemFireCacheImpl.getInternalResourceManager())
+ .isSameAs(mockInternalResourceManager);
+ }
+
+ @Test
public void checkPurgeCCPTimer() {
InternalDistributedSystem ds = Fakes.distributedSystem();
CacheConfig cc = new CacheConfig();
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
new file mode 100644
index 0000000..afaa04b
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
+import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Category(UnitTest.class)
+public class GridProfileTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ GridProfile mockGridProfile = mock(GridProfile.class);
+ ProfileId mockProfileId = mock(ProfileId.class);
+ List<Profile> listOfProfiles = new ArrayList<>();
+ listOfProfiles.add(mock(Profile.class));
+
+ when(mockGridProfile.getHost()).thenReturn("HOST");
+ when(mockGridProfile.getPort()).thenReturn(1);
+ when(mockGridProfile.getId()).thenReturn(mockProfileId);
+
+ mockGridProfile.setHost("host");
+ mockGridProfile.setPort(2);
+ mockGridProfile.tellLocalControllers(true, true, listOfProfiles);
+ mockGridProfile.tellLocalBridgeServers(true, true, listOfProfiles);
+
+ verify(mockGridProfile, times(1)).setHost("host");
+ verify(mockGridProfile, times(1)).setPort(2);
+ verify(mockGridProfile, times(1)).tellLocalControllers(true, true, listOfProfiles);
+ verify(mockGridProfile, times(1)).tellLocalBridgeServers(true, true, listOfProfiles);
+
+ assertThat(mockGridProfile.getHost()).isEqualTo("HOST");
+ assertThat(mockGridProfile.getPort()).isEqualTo(1);
+ assertThat(mockGridProfile.getId()).isSameAs(mockProfileId);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/97a6e1ae/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
new file mode 100644
index 0000000..b9cb872
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(UnitTest.class)
+public class MemberFunctionStreamingMessageTest {
+
+ @Test
+ public void shouldBeMockable() throws Exception {
+ MemberFunctionStreamingMessage mockMemberFunctionStreamingMessage =
+ mock(MemberFunctionStreamingMessage.class);
+ InternalDistributedMember mockInternalDistributedMember = mock(InternalDistributedMember.class);
+ when(mockMemberFunctionStreamingMessage.getMemberToMasqueradeAs())
+ .thenReturn(mockInternalDistributedMember);
+ assertThat(mockMemberFunctionStreamingMessage.getMemberToMasqueradeAs())
+ .isSameAs(mockInternalDistributedMember);
+ }
+}
[56/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
index bd6d810..c63b10b 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
@@ -14,6 +14,30 @@
*/
package org.apache.geode.management.internal.cli;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.execute.AbstractExecution;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.DistributedSystemMXBean;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.functions.MembersForRegionFunction;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.result.CommandResultException;
+import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileFilter;
@@ -42,30 +66,6 @@ import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.execute.AbstractExecution;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.management.DistributedSystemMXBean;
-import org.apache.geode.management.ManagementService;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.functions.MembersForRegionFunction;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.result.CommandResultException;
-import org.apache.geode.management.internal.cli.result.ResultBuilder;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
-
/**
* This class contains utility methods used by classes used to build the Command Line Interface
* (CLI).
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
index ae44e24..26b903b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
@@ -14,13 +14,7 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.shell.core.CommandMarker;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
@@ -29,13 +23,18 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.MemberNotFoundException;
+import org.springframework.shell.core.CommandMarker;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashSet;
+import java.util.Set;
/**
* The AbstractCommandsSupport class is an abstract base class encapsulating common functionality
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
index 5dfc1b8..ca2de76 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
@@ -23,6 +23,7 @@ import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.cli.Result;
@@ -42,7 +43,6 @@ import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.InfoResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
-import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
@@ -56,8 +56,6 @@ import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -76,7 +74,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
new AlterRuntimeConfigFunction();
@CliCommand(value = {CliStrings.DESCRIBE_CONFIG}, help = CliStrings.DESCRIBE_CONFIG__HELP)
- @CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result describeConfig(@CliOption(key = CliStrings.DESCRIBE_CONFIG__MEMBER,
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
@@ -131,10 +129,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
SectionResultData cacheServerSection = crd.addSection();
cacheServerSection.setHeader("Cache-server attributes");
- Iterator<Map<String, String>> iters = cacheServerAttributesList.iterator();
-
- while (iters.hasNext()) {
- Map<String, String> cacheServerAttributes = iters.next();
+ for (Map<String, String> cacheServerAttributes : cacheServerAttributesList) {
addSubSection(cacheServerSection, cacheServerAttributes, "");
}
}
@@ -164,7 +159,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
SectionResultData section = crd.addSection();
section.setHeader(headerText);
section.addSeparator('.');
- Set<String> attributes = new TreeSet<String>(attrMap.keySet());
+ Set<String> attributes = new TreeSet<>(attrMap.keySet());
for (String attribute : attributes) {
String attributeValue = attrMap.get(attribute);
@@ -177,7 +172,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
String headerText) {
if (!attrMap.isEmpty()) {
SectionResultData subSection = section.addSection();
- Set<String> attributes = new TreeSet<String>(attrMap.keySet());
+ Set<String> attributes = new TreeSet<>(attrMap.keySet());
subSection.setHeader(headerText);
for (String attribute : attributes) {
@@ -262,16 +257,12 @@ public class ConfigCommands extends AbstractCommandsSupport {
optionContext = ConverterHint.MEMBERGROUP,
help = CliStrings.ALTER_RUNTIME_CONFIG__MEMBER__HELP) String group,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT__HELP) Integer archiveDiskSpaceLimit,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT__HELP) Integer archiveFileSizeLimit,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT__HELP) Integer logDiskSpaceLimit,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT__HELP) Integer logFileSizeLimit,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__LOG__LEVEL},
optionContext = ConverterHint.LOG_LEVEL,
@@ -279,31 +270,24 @@ public class ConfigCommands extends AbstractCommandsSupport {
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__ARCHIVE__FILE},
help = CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__ARCHIVE__FILE__HELP) String statisticArchiveFile,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLE__RATE},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLE__RATE__HELP) Integer statisticSampleRate,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED__HELP) Boolean statisticSamplingEnabled,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__COPY__ON__READ},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "false",
help = CliStrings.ALTER_RUNTIME_CONFIG__COPY__ON__READ__HELP) Boolean setCopyOnRead,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__LOCK__LEASE},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__LOCK__LEASE__HELP) Integer lockLease,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__LOCK__TIMEOUT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__LOCK__TIMEOUT__HELP) Integer lockTimeout,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__MESSAGE__SYNC__INTERVAL},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__MESSAGE__SYNC__INTERVAL__HELP) Integer messageSyncInterval,
@CliOption(key = {CliStrings.ALTER_RUNTIME_CONFIG__SEARCH__TIMEOUT},
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_RUNTIME_CONFIG__SEARCH__TIMEOUT__HELP) Integer searchTimeout) {
- Map<String, String> runTimeDistributionConfigAttributes = new HashMap<String, String>();
- Map<String, String> rumTimeCacheAttributes = new HashMap<String, String>();
- Set<DistributedMember> targetMembers = new HashSet<DistributedMember>();
+ Map<String, String> runTimeDistributionConfigAttributes = new HashMap<>();
+ Map<String, String> rumTimeCacheAttributes = new HashMap<>();
+ Set<DistributedMember> targetMembers;
try {
@@ -381,7 +365,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
}
if (!runTimeDistributionConfigAttributes.isEmpty() || !rumTimeCacheAttributes.isEmpty()) {
- Map<String, String> allRunTimeAttributes = new HashMap<String, String>();
+ Map<String, String> allRunTimeAttributes = new HashMap<>();
allRunTimeAttributes.putAll(runTimeDistributionConfigAttributes);
allRunTimeAttributes.putAll(rumTimeCacheAttributes);
@@ -390,8 +374,8 @@ public class ConfigCommands extends AbstractCommandsSupport {
List<CliFunctionResult> results = CliFunctionResult.cleanResults((List<?>) rc.getResult());
CompositeResultData crd = ResultBuilder.createCompositeResultData();
TabularResultData tabularData = crd.addSection().addTable();
- Set<String> successfulMembers = new TreeSet<String>();
- Set<String> errorMessages = new TreeSet<String>();
+ Set<String> successfulMembers = new TreeSet<>();
+ Set<String> errorMessages = new TreeSet<>();
for (CliFunctionResult result : results) {
@@ -459,7 +443,7 @@ public class ConfigCommands extends AbstractCommandsSupport {
Map<String, String> arguments = parseResult.getParamValueStrings();
// validate log level
String logLevel = arguments.get("log-level");
- if (!StringUtils.isBlank(logLevel) && (LogLevel.getLevel(logLevel) == null)) {
+ if (StringUtils.isNotBlank(logLevel) && (LogLevel.getLevel(logLevel) == null)) {
return ResultBuilder.createUserErrorResult("Invalid log level: " + logLevel);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 5b0651e..b8ebc49 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -14,28 +14,7 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Pattern;
-
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.ExpirationAttributes;
@@ -52,7 +31,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.DistributedRegionMXBean;
@@ -83,14 +61,33 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
/**
* @since GemFire 7.0
*/
public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
- public static final Set<RegionShortcut> PERSISTENT_OVERFLOW_SHORTCUTS =
- new TreeSet<RegionShortcut>();
+ public static final Set<RegionShortcut> PERSISTENT_OVERFLOW_SHORTCUTS = new TreeSet<>();
private SecurityService securityService = IntegratedSecurityService.getSecurityService();
@@ -117,17 +114,13 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
public Result createRegion(
@CliOption(key = CliStrings.CREATE_REGION__REGION, mandatory = true,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__REGION__HELP) String regionPath,
- @CliOption(key = CliStrings.CREATE_REGION__REGIONSHORTCUT, mandatory = false,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
+ @CliOption(key = CliStrings.CREATE_REGION__REGIONSHORTCUT,
help = CliStrings.CREATE_REGION__REGIONSHORTCUT__HELP) RegionShortcut regionShortcut,
@CliOption(key = CliStrings.CREATE_REGION__USEATTRIBUTESFROM,
optionContext = ConverterHint.REGION_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__USEATTRIBUTESFROM__HELP) String useAttributesFrom,
@CliOption(key = CliStrings.CREATE_REGION__GROUP, optionContext = ConverterHint.MEMBERGROUP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__GROUP__HELP) String[] groups,
@CliOption(key = CliStrings.CREATE_REGION__SKIPIFEXISTS, unspecifiedDefaultValue = "true",
specifiedDefaultValue = "true",
@@ -145,44 +138,32 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
help = CliStrings.CREATE_REGION__CACHEWRITER__HELP) String cacheWriter,
@CliOption(key = CliStrings.CREATE_REGION__COLOCATEDWITH,
optionContext = ConverterHint.REGION_PATH,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__COLOCATEDWITH__HELP) String prColocatedWith,
@CliOption(key = CliStrings.CREATE_REGION__COMPRESSOR,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__COMPRESSOR__HELP) String compressor,
@CliOption(key = CliStrings.CREATE_REGION__CONCURRENCYLEVEL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__CONCURRENCYLEVEL__HELP) Integer concurrencyLevel,
@CliOption(key = CliStrings.CREATE_REGION__DISKSTORE,
help = CliStrings.CREATE_REGION__DISKSTORE__HELP) String diskStore,
@CliOption(key = CliStrings.CREATE_REGION__ENABLEASYNCCONFLATION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__ENABLEASYNCCONFLATION__HELP) Boolean enableAsyncConflation,
@CliOption(key = CliStrings.CREATE_REGION__CLONINGENABLED,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__CLONINGENABLED__HELP) Boolean cloningEnabled,
@CliOption(key = CliStrings.CREATE_REGION__CONCURRENCYCHECKSENABLED,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__CONCURRENCYCHECKSENABLED__HELP) Boolean concurrencyChecksEnabled,
@CliOption(key = CliStrings.CREATE_REGION__MULTICASTENABLED,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__MULTICASTENABLED__HELP) Boolean mcastEnabled,
@CliOption(key = CliStrings.CREATE_REGION__STATISTICSENABLED,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__STATISTICSENABLED__HELP) Boolean statisticsEnabled,
@CliOption(key = CliStrings.CREATE_REGION__ENABLESUBSCRIPTIONCONFLATION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__ENABLESUBSCRIPTIONCONFLATION__HELP) Boolean enableSubscriptionConflation,
@CliOption(key = CliStrings.CREATE_REGION__DISKSYNCHRONOUS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__DISKSYNCHRONOUS__HELP) Boolean diskSynchronous,
@CliOption(key = CliStrings.CREATE_REGION__ENTRYEXPIRATIONIDLETIME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__ENTRYEXPIRATIONIDLETIME__HELP) Integer entryExpirationIdleTime,
@CliOption(key = CliStrings.CREATE_REGION__ENTRYEXPIRATIONIDLETIMEACTION,
help = CliStrings.CREATE_REGION__ENTRYEXPIRATIONIDLETIMEACTION__HELP) String entryExpirationIdleTimeAction,
@CliOption(key = CliStrings.CREATE_REGION__ENTRYEXPIRATIONTIMETOLIVE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__ENTRYEXPIRATIONTIMETOLIVE__HELP) Integer entryExpirationTTL,
@CliOption(key = CliStrings.CREATE_REGION__ENTRYEXPIRATIONTTLACTION,
help = CliStrings.CREATE_REGION__ENTRYEXPIRATIONTTLACTION__HELP) String entryExpirationTTLAction,
@@ -191,45 +172,34 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
@CliOption(key = CliStrings.CREATE_REGION__KEYCONSTRAINT,
help = CliStrings.CREATE_REGION__KEYCONSTRAINT__HELP) String keyConstraint,
@CliOption(key = CliStrings.CREATE_REGION__LOCALMAXMEMORY,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__LOCALMAXMEMORY__HELP) Integer prLocalMaxMemory,
- @CliOption(key = CliStrings.CREATE_REGION__OFF_HEAP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "true",
+ @CliOption(key = CliStrings.CREATE_REGION__OFF_HEAP, specifiedDefaultValue = "true",
help = CliStrings.CREATE_REGION__OFF_HEAP__HELP) Boolean offHeap,
@CliOption(key = CliStrings.CREATE_REGION__PARTITION_RESOLVER,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__PARTITION_RESOLVER__HELP) String partitionResolver,
@CliOption(key = CliStrings.CREATE_REGION__REGIONEXPIRATIONIDLETIME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__REGIONEXPIRATIONIDLETIME__HELP) Integer regionExpirationIdleTime,
@CliOption(key = CliStrings.CREATE_REGION__REGIONEXPIRATIONIDLETIMEACTION,
help = CliStrings.CREATE_REGION__REGIONEXPIRATIONIDLETIMEACTION__HELP) String regionExpirationIdleTimeAction,
@CliOption(key = CliStrings.CREATE_REGION__REGIONEXPIRATIONTTL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__REGIONEXPIRATIONTTL__HELP) Integer regionExpirationTTL,
@CliOption(key = CliStrings.CREATE_REGION__REGIONEXPIRATIONTTLACTION,
help = CliStrings.CREATE_REGION__REGIONEXPIRATIONTTLACTION__HELP) String regionExpirationTTLAction,
@CliOption(key = CliStrings.CREATE_REGION__RECOVERYDELAY,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__RECOVERYDELAY__HELP) Long prRecoveryDelay,
@CliOption(key = CliStrings.CREATE_REGION__REDUNDANTCOPIES,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__REDUNDANTCOPIES__HELP) Integer prRedundantCopies,
@CliOption(key = CliStrings.CREATE_REGION__STARTUPRECOVERYDDELAY,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__STARTUPRECOVERYDDELAY__HELP) Long prStartupRecoveryDelay,
@CliOption(key = CliStrings.CREATE_REGION__TOTALMAXMEMORY,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__TOTALMAXMEMORY__HELP) Long prTotalMaxMemory,
@CliOption(key = CliStrings.CREATE_REGION__TOTALNUMBUCKETS,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.CREATE_REGION__TOTALNUMBUCKETS__HELP) Integer prTotalNumBuckets,
@CliOption(key = CliStrings.CREATE_REGION__VALUECONSTRAINT,
help = CliStrings.CREATE_REGION__VALUECONSTRAINT__HELP) String valueConstraint
// NOTICE: keep the region attributes params in alphabetical order
) {
- Result result = null;
+ Result result;
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
try {
@@ -271,7 +241,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
regionExpirationTTLAction);
}
- RegionFunctionArgs regionFunctionArgs = null;
+ RegionFunctionArgs regionFunctionArgs;
if (useAttributesFrom != null) {
if (!regionExists(cache, useAttributesFrom)) {
throw new IllegalArgumentException(CliStrings.format(
@@ -330,7 +300,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
validateRegionFunctionArgs(cache, regionFunctionArgs);
- Set<DistributedMember> membersToCreateRegionOn = null;
+ Set<DistributedMember> membersToCreateRegionOn;
if (groups != null && groups.length != 0) {
membersToCreateRegionOn = CliUtil.getDistributedMembersByGroup(cache, groups);
// have only normal members from the group
@@ -370,10 +340,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
result = ResultBuilder.buildResult(tabularResultData);
verifyDistributedRegionMbean(cache, regionPath);
- } catch (IllegalArgumentException e) {
- LogWrapper.getInstance().info(e.getMessage());
- result = ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
LogWrapper.getInstance().info(e.getMessage());
result = ResultBuilder.createUserErrorResult(e.getMessage());
} catch (RuntimeException e) {
@@ -406,8 +373,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
} else {
Thread.sleep(2);
}
- } catch (Exception ex) {
- continue;
+ } catch (Exception ignored) {
}
}
return false;
@@ -417,64 +383,47 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION)
public Result alterRegion(
@CliOption(key = CliStrings.ALTER_REGION__REGION, mandatory = true,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_REGION__REGION__HELP) String regionPath,
@CliOption(key = CliStrings.ALTER_REGION__GROUP, optionContext = ConverterHint.MEMBERGROUP,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.ALTER_REGION__GROUP__HELP) String[] groups,
@CliOption(key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "-1",
+ specifiedDefaultValue = "-1",
help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME__HELP) Integer entryExpirationIdleTime,
@CliOption(key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "INVALIDATE",
help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION__HELP) String entryExpirationIdleTimeAction,
@CliOption(key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTIMETOLIVE,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "-1",
+ specifiedDefaultValue = "-1",
help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTIMETOLIVE__HELP) Integer entryExpirationTTL,
@CliOption(key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTTLACTION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "INVALIDATE",
help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTTLACTION__HELP) String entryExpirationTTLAction,
@CliOption(key = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIME,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "-1",
+ specifiedDefaultValue = "-1",
help = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIME__HELP) Integer regionExpirationIdleTime,
@CliOption(key = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIMEACTION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "INVALIDATE",
help = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIMEACTION__HELP) String regionExpirationIdleTimeAction,
- @CliOption(key = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTL,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "-1",
+ @CliOption(key = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTL, specifiedDefaultValue = "-1",
help = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTL__HELP) Integer regionExpirationTTL,
@CliOption(key = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
specifiedDefaultValue = "INVALIDATE",
help = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION__HELP) String regionExpirationTTLAction,
- @CliOption(key = CliStrings.ALTER_REGION__CACHELISTENER,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "",
+ @CliOption(key = CliStrings.ALTER_REGION__CACHELISTENER, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__CACHELISTENER__HELP) String[] cacheListeners,
- @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "null",
+ @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER, specifiedDefaultValue = "null",
help = CliStrings.ALTER_REGION__CACHELOADER__HELP) String cacheLoader,
- @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "null",
+ @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER, specifiedDefaultValue = "null",
help = CliStrings.ALTER_REGION__CACHEWRITER__HELP) String cacheWriter,
- @CliOption(key = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "",
+ @CliOption(key = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID__HELP) String[] asyncEventQueueIds,
- @CliOption(key = CliStrings.ALTER_REGION__GATEWAYSENDERID,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "",
+ @CliOption(key = CliStrings.ALTER_REGION__GATEWAYSENDERID, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__GATEWAYSENDERID__HELP) String[] gatewaySenderIds,
- @CliOption(key = CliStrings.ALTER_REGION__CLONINGENABLED,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "false",
+ @CliOption(key = CliStrings.ALTER_REGION__CLONINGENABLED, specifiedDefaultValue = "false",
help = CliStrings.ALTER_REGION__CLONINGENABLED__HELP) Boolean cloningEnabled,
- @CliOption(key = CliStrings.ALTER_REGION__EVICTIONMAX,
- unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, specifiedDefaultValue = "0",
+ @CliOption(key = CliStrings.ALTER_REGION__EVICTIONMAX, specifiedDefaultValue = "0",
help = CliStrings.ALTER_REGION__EVICTIONMAX__HELP) Integer evictionMax) {
- Result result = null;
+ Result result;
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
this.securityService.authorizeRegionManage(regionPath);
@@ -535,10 +484,10 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
regionExpirationTTLAction);
}
- cacheLoader = convertDefaultValue(cacheLoader, StringUtils.EMPTY_STRING);
- cacheWriter = convertDefaultValue(cacheWriter, StringUtils.EMPTY_STRING);
+ cacheLoader = convertDefaultValue(cacheLoader, StringUtils.EMPTY);
+ cacheWriter = convertDefaultValue(cacheWriter, StringUtils.EMPTY);
- RegionFunctionArgs regionFunctionArgs = null;
+ RegionFunctionArgs regionFunctionArgs;
regionFunctionArgs = new RegionFunctionArgs(regionPath, null, null, false, null, null, null,
entryIdle, entryTTL, regionIdle, regionTTL, null, null, null, null, cacheListeners,
cacheLoader, cacheWriter, asyncEventQueueIds, gatewaySenderIds, null, cloningEnabled,
@@ -599,10 +548,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
}
result = ResultBuilder.buildResult(tabularResultData);
- } catch (IllegalArgumentException e) {
- LogWrapper.getInstance().info(e.getMessage());
- result = ResultBuilder.createUserErrorResult(e.getMessage());
- } catch (IllegalStateException e) {
+ } catch (IllegalArgumentException | IllegalStateException e) {
LogWrapper.getInstance().info(e.getMessage());
result = ResultBuilder.createUserErrorResult(e.getMessage());
} catch (RuntimeException e) {
@@ -624,8 +570,8 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
DistributedSystemMXBean dsMBean = managementService.getDistributedSystemMXBean();
String[] allRegionPaths = dsMBean.listAllRegionPaths();
- for (int i = 0; i < allRegionPaths.length; i++) {
- if (allRegionPaths[i].equals(regionPath)) {
+ for (String allRegionPath : allRegionPaths) {
+ if (allRegionPath.equals(regionPath)) {
regionFound = true;
break;
}
@@ -635,7 +581,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
private void validateRegionPathAndParent(InternalCache cache, String regionPath) {
- if (regionPath == null || "".equals(regionPath)) {
+ if (StringUtils.isEmpty(regionPath)) {
throw new IllegalArgumentException(CliStrings.CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH);
}
// If a region path indicates a sub-region, check whether the parent region exists
@@ -652,13 +598,13 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
private void validateGroups(InternalCache cache, String[] groups) {
if (groups != null && groups.length != 0) {
- Set<String> existingGroups = new HashSet<String>();
+ Set<String> existingGroups = new HashSet<>();
Set<DistributedMember> members = CliUtil.getAllNormalMembers(cache);
for (DistributedMember distributedMember : members) {
List<String> memberGroups = distributedMember.getGroups();
existingGroups.addAll(memberGroups);
}
- List<String> groupsList = new ArrayList<String>(Arrays.asList(groups));
+ List<String> groupsList = new ArrayList<>(Arrays.asList(groups));
groupsList.removeAll(existingGroups);
if (!groupsList.isEmpty()) {
@@ -800,8 +746,8 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
throw new IllegalArgumentException(
CliStrings.CREATE_REGION__MSG__NO_GATEWAYSENDERS_IN_THE_SYSTEM);
} else {
- List<String> gatewaySendersList = new ArrayList<String>(Arrays.asList(gatewaySenders));
- gatewaySenderIds = new HashSet<String>(gatewaySenderIds);
+ List<String> gatewaySendersList = new ArrayList<>(Arrays.asList(gatewaySenders));
+ gatewaySenderIds = new HashSet<>(gatewaySenderIds);
gatewaySenderIds.removeAll(gatewaySendersList);
if (!gatewaySenderIds.isEmpty()) {
throw new IllegalArgumentException(CliStrings.format(
@@ -874,14 +820,9 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
String compressorClassName = regionFunctionArgs.getCompressor();
Object compressor = null;
try {
- Class<?> compressorClass =
- (Class<?>) ClassPathLoader.getLatest().forName(compressorClassName);
+ Class<?> compressorClass = ClassPathLoader.getLatest().forName(compressorClassName);
compressor = compressorClass.newInstance();
- } catch (InstantiationException e) {
- compressorFailure = true;
- } catch (IllegalAccessException e) {
- compressorFailure = true;
- } catch (ClassNotFoundException e) {
+ } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
compressorFailure = true;
}
@@ -954,8 +895,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
List<?> resultsList = (List<?>) resultCollector.getResult();
if (resultsList != null && !resultsList.isEmpty()) {
- for (int i = 0; i < resultsList.size(); i++) {
- Object object = resultsList.get(i);
+ for (Object object : resultsList) {
if (object instanceof IllegalArgumentException) {
throw (IllegalArgumentException) object;
} else if (object instanceof Throwable) {
@@ -1024,7 +964,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
@CliCommand(value = {CliStrings.DESTROY_REGION}, help = CliStrings.DESTROY_REGION__HELP)
- @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_REGION)
+ @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
public Result destroyRegion(
@CliOption(key = CliStrings.DESTROY_REGION__REGION, optionContext = ConverterHint.REGION_PATH,
@@ -1035,15 +975,14 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
.createInfoResult(CliStrings.DESTROY_REGION__MSG__SPECIFY_REGIONPATH_TO_DESTROY);
}
- if (regionPath.trim().isEmpty() || regionPath.equals(Region.SEPARATOR)) {
+ if (StringUtils.isBlank(regionPath) || regionPath.equals(Region.SEPARATOR)) {
return ResultBuilder.createInfoResult(CliStrings.format(
CliStrings.DESTROY_REGION__MSG__REGIONPATH_0_NOT_VALID, new Object[] {regionPath}));
}
- Result result = null;
+ Result result;
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
try {
- String message = "";
InternalCache cache = getCache();
ManagementService managementService = ManagementService.getExistingManagementService(cache);
String regionPathToUse = regionPath;
@@ -1061,18 +1000,18 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
new Object[] {regionPath, "jmx-manager-update-rate milliseconds"}));
}
- CliFunctionResult destroyRegionResult = null;
+ CliFunctionResult destroyRegionResult;
ResultCollector<?, ?> resultCollector =
CliUtil.executeFunction(RegionDestroyFunction.INSTANCE, regionPath, regionMembersList);
List<CliFunctionResult> resultsList = (List<CliFunctionResult>) resultCollector.getResult();
- message = CliStrings.format(CliStrings.DESTROY_REGION__MSG__REGION_0_1_DESTROYED,
+ String message = CliStrings.format(CliStrings.DESTROY_REGION__MSG__REGION_0_1_DESTROYED,
new Object[] {regionPath, ""});
// Only if there is an error is this set to false
boolean isRegionDestroyed = true;
- for (int i = 0; i < resultsList.size(); i++) {
- destroyRegionResult = resultsList.get(i);
+ for (CliFunctionResult aResultsList : resultsList) {
+ destroyRegionResult = aResultsList;
if (destroyRegionResult.isSuccessful()) {
xmlEntity.set(destroyRegionResult.getXmlEntity());
} else if (destroyRegionResult.getThrowable() != null) {
@@ -1175,7 +1114,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
private Set<DistributedMember> getMembersByIds(InternalCache cache, Set<String> memberIds) {
Set<DistributedMember> foundMembers = Collections.emptySet();
if (memberIds != null && !memberIds.isEmpty()) {
- foundMembers = new HashSet<DistributedMember>();
+ foundMembers = new HashSet<>();
Set<DistributedMember> allNormalMembers = CliUtil.getAllNormalMembers(cache);
for (String memberId : memberIds) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
index dfd20a9..ea10182 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
@@ -14,30 +14,16 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static java.util.stream.Collectors.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toSet;
import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.Logger;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
@@ -58,6 +44,20 @@ import org.apache.geode.management.internal.configuration.utils.ZipUtils;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.logging.log4j.Logger;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Commands for the cluster configuration
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
index 9110a1a..a4ba64c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommands.java
@@ -145,11 +145,12 @@ public class IndexCommands extends AbstractCommandsSupport {
final TabularResultData indexData = ResultBuilder.createTabularResultData();
for (final IndexDetails indexDetails : indexDetailsList) {
- indexData.accumulate("Member Name", StringUtils.valueOf(indexDetails.getMemberName(), ""));
+ indexData.accumulate("Member Name",
+ StringUtils.defaultString(indexDetails.getMemberName()));
indexData.accumulate("Member ID", indexDetails.getMemberId());
indexData.accumulate("Region Path", indexDetails.getRegionPath());
indexData.accumulate("Name", indexDetails.getIndexName());
- indexData.accumulate("Type", StringUtils.valueOf(indexDetails.getIndexType(), ""));
+ indexData.accumulate("Type", StringUtils.defaultString(indexDetails.getIndexType()));
indexData.accumulate("Indexed Expression", indexDetails.getIndexedExpression());
indexData.accumulate("From Clause", indexDetails.getFromClause());
@@ -355,7 +356,7 @@ public class IndexCommands extends AbstractCommandsSupport {
// If a regionName is specified, then authorize data manage on the regionName, otherwise, it
// requires data manage permission on all regions
- if (!StringUtils.isBlank(regionPath)) {
+ if (StringUtils.isNotBlank(regionPath)) {
regionName = regionPath.startsWith("/") ? regionPath.substring(1) : regionPath;
this.securityService.authorizeRegionManage(regionName);
} else {
@@ -405,15 +406,15 @@ public class IndexCommands extends AbstractCommandsSupport {
if (!successfulMembers.isEmpty()) {
InfoResultData infoResult = ResultBuilder.createInfoResultData();
- if (!StringUtils.isBlank(indexName)) {
- if (!StringUtils.isBlank(regionPath)) {
+ if (StringUtils.isNotBlank(indexName)) {
+ if (StringUtils.isNotBlank(regionPath)) {
infoResult.addLine(CliStrings.format(CliStrings.DESTROY_INDEX__ON__REGION__SUCCESS__MSG,
indexName, regionPath));
} else {
infoResult.addLine(CliStrings.format(CliStrings.DESTROY_INDEX__SUCCESS__MSG, indexName));
}
} else {
- if (!StringUtils.isBlank(regionPath)) {
+ if (StringUtils.isNotBlank(regionPath)) {
infoResult.addLine(CliStrings
.format(CliStrings.DESTROY_INDEX__ON__REGION__ONLY__SUCCESS__MSG, regionPath));
} else {
@@ -431,7 +432,7 @@ public class IndexCommands extends AbstractCommandsSupport {
} else {
ErrorResultData erd = ResultBuilder.createErrorResultData();
- if (!StringUtils.isBlank(indexName)) {
+ if (StringUtils.isNotBlank(indexName)) {
erd.addLine(CliStrings.format(CliStrings.DESTROY_INDEX__FAILURE__MSG, indexName));
} else {
erd.addLine("Indexes could not be destroyed for following reasons");
@@ -668,27 +669,27 @@ public class IndexCommands extends AbstractCommandsSupport {
public String getNumberOfKeys() {
return (getIndexStatisticsDetails() != null
- ? StringUtils.valueOf(getIndexStatisticsDetails().getNumberOfKeys(), "") : "");
+ ? StringUtils.defaultString(getIndexStatisticsDetails().getNumberOfKeys()) : "");
}
public String getNumberOfUpdates() {
return (getIndexStatisticsDetails() != null
- ? StringUtils.valueOf(getIndexStatisticsDetails().getNumberOfUpdates(), "") : "");
+ ? StringUtils.defaultString(getIndexStatisticsDetails().getNumberOfUpdates()) : "");
}
public String getNumberOfValues() {
return (getIndexStatisticsDetails() != null
- ? StringUtils.valueOf(getIndexStatisticsDetails().getNumberOfValues(), "") : "");
+ ? StringUtils.defaultString(getIndexStatisticsDetails().getNumberOfValues()) : "");
}
public String getTotalUpdateTime() {
return (getIndexStatisticsDetails() != null
- ? StringUtils.valueOf(getIndexStatisticsDetails().getTotalUpdateTime(), "") : "");
+ ? StringUtils.defaultString(getIndexStatisticsDetails().getTotalUpdateTime()) : "");
}
public String getTotalUses() {
return (getIndexStatisticsDetails() != null
- ? StringUtils.valueOf(getIndexStatisticsDetails().getTotalUses(), "") : "");
+ ? StringUtils.defaultString(getIndexStatisticsDetails().getTotalUses()) : "");
}
}
[03/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index da86d8e..00707f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -88,7 +88,7 @@ public class MsgStreamer extends OutputStream
/**
* Called to free up resources used by this streamer after the streamer has produced its message.
*/
- protected final void release() {
+ protected void release() {
MsgIdGenerator.release(this.msgId);
this.buffer.clear();
this.overflowBuf = null;
@@ -99,7 +99,7 @@ public class MsgStreamer extends OutputStream
* Returns an exception the describes which cons the message was not sent to. Call this after
* {@link #writeMessage}.
*/
- public final ConnectExceptions getConnectExceptions() {
+ public ConnectExceptions getConnectExceptions() {
return this.ce;
}
@@ -107,7 +107,7 @@ public class MsgStreamer extends OutputStream
* Returns a list of the Connections that the message was sent to. Call this after
* {@link #writeMessage}.
*/
- public final List<?> getSentConnections() {
+ public List<?> getSentConnections() {
return this.cons;
}
@@ -224,7 +224,7 @@ public class MsgStreamer extends OutputStream
/**
* @throws IOException if serialization failure
*/
- public final int writeMessage() throws IOException {
+ public int writeMessage() throws IOException {
// if (logger.isTraceEnabled()) logger.trace(this.msg);
try {
@@ -244,7 +244,7 @@ public class MsgStreamer extends OutputStream
/** write the low-order 8 bits of the given int */
@Override
- public final void write(int b) {
+ public void write(int b) {
// if (logger.isTraceEnabled()) logger.trace(" byte={}", b);
ensureCapacity(1);
@@ -255,7 +255,7 @@ public class MsgStreamer extends OutputStream
this.buffer.put((byte) b);
}
- private final void ensureCapacity(int amount) {
+ private void ensureCapacity(int amount) {
if (this.overflowBuf != null) {
return;
}
@@ -289,7 +289,7 @@ public class MsgStreamer extends OutputStream
}
}
- public final void realFlush(boolean lastFlushForMessage) {
+ public void realFlush(boolean lastFlushForMessage) {
if (isOverflowMode()) {
if (this.overflowBuf == null) {
this.overflowBuf = new HeapDataOutputStream(
@@ -335,7 +335,7 @@ public class MsgStreamer extends OutputStream
}
@Override
- public final void close() throws IOException {
+ public void close() throws IOException {
try {
if (this.startedSerializingMsg && !this.doneWritingMsg) {
// if we wrote any bytes on the cnxs then we need to close them
@@ -354,7 +354,7 @@ public class MsgStreamer 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) {
// if (logger.isTraceEnabled()) {
// logger.trace(" bytes={} offset={} len={}", source, offset, len);
// }
@@ -383,7 +383,7 @@ public class MsgStreamer extends OutputStream
}
@Override
- public final void write(ByteBuffer bb) {
+ public void write(ByteBuffer bb) {
// if (logger.isTraceEnabled()) {
// logger.trace(" bytes={} offset={} len={}", source, offset, len);
// }
@@ -417,7 +417,7 @@ public class MsgStreamer extends OutputStream
/**
* write the header after the message has been written to the stream
*/
- private final void setMessageHeader() {
+ private void setMessageHeader() {
Assert.assertTrue(this.overflowBuf == null);
Assert.assertTrue(!isOverflowMode());
// int processorType = this.msg.getProcessorType();
@@ -457,7 +457,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the boolean to be written.
*/
- public final void writeBoolean(boolean v) {
+ public void writeBoolean(boolean v) {
write(v ? 1 : 0);
}
@@ -470,7 +470,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the byte value to be written.
*/
- public final void writeByte(int v) {
+ public void writeByte(int v) {
write(v);
}
@@ -492,7 +492,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>short</code> value to be written.
*/
- public final void writeShort(int v) {
+ public void writeShort(int v) {
// if (logger.isTraceEnabled()) logger.trace(" short={}", v);
ensureCapacity(2);
@@ -521,7 +521,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>char</code> value to be written.
*/
- public final void writeChar(int v) {
+ public void writeChar(int v) {
// if (logger.isTraceEnabled()) logger.trace(" char={}", v);
ensureCapacity(2);
@@ -551,7 +551,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>int</code> value to be written.
*/
- public final void writeInt(int v) {
+ public void writeInt(int v) {
// if (logger.isTraceEnabled()) logger.trace(" int={}", v);
ensureCapacity(4);
@@ -585,7 +585,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>long</code> value to be written.
*/
- public final void writeLong(long v) {
+ public void writeLong(long v) {
// if (logger.isTraceEnabled()) logger.trace(" long={}", v);
ensureCapacity(8);
@@ -606,7 +606,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>float</code> value to be written.
*/
- public final void writeFloat(float v) {
+ public void writeFloat(float v) {
// if (logger.isTraceEnabled()) logger.trace(" float={}", v);
ensureCapacity(4);
@@ -627,7 +627,7 @@ public class MsgStreamer extends OutputStream
*
* @param v the <code>double</code> value to be written.
*/
- public final void writeDouble(double v) {
+ public void writeDouble(double v) {
// if (logger.isTraceEnabled()) logger.trace(" double={}", v);
ensureCapacity(8);
@@ -651,7 +651,7 @@ public class MsgStreamer extends OutputStream
*
* @param str the string of bytes to be written.
*/
- public final void writeBytes(String str) {
+ public void writeBytes(String str) {
// if (logger.isTraceEnabled()) logger.trace(" bytes={}", str);
if (this.overflowBuf != null) {
@@ -676,7 +676,7 @@ public class MsgStreamer extends OutputStream
*
* @param s the string value to be written.
*/
- public final void writeChars(String s) {
+ public void writeChars(String s) {
// if (logger.isTraceEnabled()) logger.trace(" chars={}", s);
if (this.overflowBuf != null) {
@@ -765,7 +765,7 @@ public class MsgStreamer extends OutputStream
* @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 {
// if (logger.isTraceEnabled()) logger.trace(" utf={}", str);
if (this.overflowBuf != null) {
@@ -779,7 +779,7 @@ public class MsgStreamer extends OutputStream
}
}
- private final void writeAsciiUTF(String str) throws IOException {
+ private void writeAsciiUTF(String str) throws IOException {
int len = str.length();
if (len > 65535) {
throw new UTFDataFormatException();
@@ -808,7 +808,7 @@ public class MsgStreamer extends OutputStream
}
}
- private final void writeFullUTF(String str) throws IOException {
+ private void writeFullUTF(String str) throws IOException {
int strlen = str.length();
if (strlen > 65535) {
throw new UTFDataFormatException();
@@ -854,7 +854,7 @@ public class MsgStreamer extends OutputStream
/**
* Used when we know the max size will fit in the current buffer.
*/
- private final void writeQuickFullUTF(String str, int strlen) throws IOException {
+ private void writeQuickFullUTF(String str, int strlen) throws IOException {
int utfSizeIdx = this.buffer.position();
// skip bytes reserved for length
this.buffer.position(utfSizeIdx + 2);
@@ -888,7 +888,7 @@ public class MsgStreamer extends OutputStream
* the contents of the HeapDataOutputStream to this streamer. All of this is done to prevent an
* extra copy when the serialized form will all fit into our current buffer.
*/
- public final void writeAsSerializedByteArray(Object v) throws IOException {
+ public void writeAsSerializedByteArray(Object v) throws IOException {
if (v instanceof HeapDataOutputStream) {
HeapDataOutputStream other = (HeapDataOutputStream) v;
InternalDataSerializer.writeArrayLength(other.size(), this);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
index 87d9242..6797a11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamerList.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 7.1
*/
-public final class MsgStreamerList implements BaseMsgStreamer {
+public class MsgStreamerList implements BaseMsgStreamer {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
index 882cccf..d39b7be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/VersionedMsgStreamer.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.VersionedDataStream;
*
* @since GemFire 7.1
*/
-final class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
+class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStream {
private final Version version;
@@ -41,7 +41,7 @@ final class VersionedMsgStreamer extends MsgStreamer implements VersionedDataStr
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
index 45b73e9..32f041c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/CollectionUtils.java
@@ -224,7 +224,7 @@ public abstract class CollectionUtils {
* @since GemFire 8.1
* @see Collection#addAll(Collection)
*/
- public static final <T> boolean addAll(final Collection<T> collection,
+ public static <T> boolean addAll(final Collection<T> collection,
final Enumeration<T> enumeration) {
if (null == enumeration) {
return false;
@@ -247,7 +247,7 @@ public abstract class CollectionUtils {
* @return unmodifiable {@link Iterable}
* @since GemFire 8.1
*/
- public static final <T> Iterable<T> unmodifiableIterable(final Iterable<T> iterable) {
+ public static <T> Iterable<T> unmodifiableIterable(final Iterable<T> iterable) {
return new UnmodifiableIterable<T>(iterable);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
index 403c1d2..fa540fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/TransformUtils.java
@@ -25,7 +25,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
/**
* Contains common data tranformation utility methods and transformers.
*/
-public final class TransformUtils {
+public class TransformUtils {
/**
* Transforms PersistentMemberIDs to a user friendly log entry.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 94e55b0..a5f6a8d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -218,7 +218,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* tables, that otherwise encounter collisions for hashCodes that do not differ in lower or upper
* bits.
*/
- public static final int keyHash(final Object o, final boolean compareValues) {
+ public static int keyHash(final Object o, final boolean compareValues) {
int h = compareValues ? o.hashCode() : System.identityHashCode(o);
// Spread bits to regularize both segment and index locations,
// using variant of single-word Wang/Jenkins hash.
@@ -236,7 +236,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param hash the hash code for the key
* @return the segment
*/
- final Segment<K, V> segmentFor(final int hash) {
+ Segment<K, V> segmentFor(final int hash) {
if (this.segmentMask == 0) {
return this.segments[0];
}
@@ -305,7 +305,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Segment.readValueUnderLock method is used as a backup in case a null (pre-initialized) value is
* ever seen in an unsynchronized access method.
*/
- static final class HashEntryImpl<K, V> implements HashEntry<K, V> {
+ static class HashEntryImpl<K, V> implements HashEntry<K, V> {
protected final K key;
@@ -329,42 +329,42 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getKey()
*/
- public final K getKey() {
+ public K getKey() {
return this.key;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getMapValue()
*/
- public final V getMapValue() {
+ public V getMapValue() {
return this.value;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#setMapValue(Object)
*/
- public final void setMapValue(V newValue) {
+ public void setMapValue(V newValue) {
this.value = newValue;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#getNextEntry()
*/
- public final HashEntry<K, V> getNextEntry() {
+ public HashEntry<K, V> getNextEntry() {
return this.next;
}
/**
* @see CustomEntryConcurrentHashMap.HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<K, V> n) {
+ public void setNextEntry(final HashEntry<K, V> n) {
this.next = n;
}
@@ -504,7 +504,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Sets table to new HashEntry array. Call only while holding lock or in constructor.
*/
- final void setTable(final HashEntry<K, V>[] newTable) {
+ void setTable(final HashEntry<K, V>[] newTable) {
this.threshold = (int) (newTable.length * this.loadFactor);
this.table = newTable;
}
@@ -512,7 +512,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* Returns properly casted first entry of bin for given hash.
*/
- final HashEntry<K, V> getFirst(final int hash) {
+ HashEntry<K, V> getFirst(final int hash) {
final HashEntry<K, V>[] tab = this.table;
return tab[hash & (tab.length - 1)];
}
@@ -522,7 +522,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* is possible only if a compiler happens to reorder a HashEntry initialization with its table
* assignment, which is legal under memory model but is not known to ever occur.
*/
- final V readValueUnderLock(final HashEntry<K, V> e) {
+ V readValueUnderLock(final HashEntry<K, V> e) {
final ReentrantReadWriteLock.ReadLock readLock = super.readLock();
readLock.lock();
final V v = e.getMapValue();
@@ -553,7 +553,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/* Specialized implementations of map methods */
- final V get(final Object key, final int hash) {
+ V get(final Object key, final int hash) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
final ReentrantReadWriteLock.ReadLock listLock = this.listUpdateLock.readLock();
@@ -582,7 +582,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return null;
}
- final V getNoLock(final Object key, final int hash, final boolean lockListForRead) {
+ V getNoLock(final Object key, final int hash, final boolean lockListForRead) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
ReentrantReadWriteLock.ReadLock listLock = null;
@@ -607,7 +607,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return null;
}
- final boolean containsKey(final Object key, final int hash) {
+ boolean containsKey(final Object key, final int hash) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
final ReentrantReadWriteLock.ReadLock listLock = this.listUpdateLock.readLock();
@@ -627,7 +627,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return false;
}
- final boolean containsValue(final Object value) {
+ boolean containsValue(final Object value) {
if (this.count != 0) { // read-volatile
// GemStone change to acquire the read lock on list updates
ReentrantReadWriteLock.ReadLock readLock = this.listUpdateLock.readLock();
@@ -662,7 +662,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return false;
}
- final boolean replace(final K key, final int hash, final V oldValue, final V newValue) {
+ boolean replace(final K key, final int hash, final V oldValue, final V newValue) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -682,7 +682,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V replace(final K key, final int hash, final V newValue) {
+ V replace(final K key, final int hash, final V newValue) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -702,7 +702,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V put(final K key, final int hash, final V value, final boolean onlyIfAbsent) {
+ V put(final K key, final int hash, final V value, final boolean onlyIfAbsent) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
try {
@@ -738,7 +738,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// GemStone additions
- final <C, P> V create(final K key, final int hash, final MapCallback<K, V, C, P> valueCreator,
+ <C, P> V create(final K key, final int hash, final MapCallback<K, V, C, P> valueCreator,
final C context, final P createParams, final boolean lockForRead) {
// TODO: This can be optimized by having a special lock implementation
// that will allow upgrade from read to write lock atomically. This can
@@ -804,7 +804,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final V get(final Object key, final int hash, final MapCallback<K, V, ?, ?> readCallback) {
+ V get(final Object key, final int hash, final MapCallback<K, V, ?, ?> readCallback) {
final ReentrantReadWriteLock.ReadLock readLock = super.readLock();
readLock.lock();
try {
@@ -831,7 +831,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// End GemStone additions
- final void rehash() {
+ void rehash() {
final HashEntry<K, V>[] oldTable = this.table;
final int oldCapacity = oldTable.length;
if (oldCapacity >= MAXIMUM_CAPACITY) {
@@ -934,7 +934,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*/
// GemStone change
// added "condition" and "removeParams" parameters
- final <C, P> V remove(final Object key, final int hash, final Object value,
+ <C, P> V remove(final Object key, final int hash, final Object value,
final MapCallback<K, V, C, P> condition, final C context, final P removeParams) {
// End GemStone change
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
@@ -1003,7 +1003,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
/**
* GemStone added the clearedEntries param and the result
*/
- final ArrayList<HashEntry<?, ?>> clear(ArrayList<HashEntry<?, ?>> clearedEntries) {
+ ArrayList<HashEntry<?, ?>> clear(ArrayList<HashEntry<?, ?>> clearedEntries) {
if (this.count != 0) {
final ReentrantReadWriteLock.WriteLock writeLock = super.writeLock();
writeLock.lock();
@@ -1069,7 +1069,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @since GemFire 7.0
*/
- static final class IdentitySegment<K, V> extends Segment<K, V> implements Serializable {
+ static class IdentitySegment<K, V> extends Segment<K, V> implements Serializable {
private static final long serialVersionUID = 3086228147110819882L;
@@ -1079,22 +1079,22 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
@SuppressWarnings("unchecked")
- static final <K, V> IdentitySegment<K, V>[] newArray(final int i) {
+ static <K, V> IdentitySegment<K, V>[] newArray(final int i) {
return new IdentitySegment[i];
}
@Override
- protected final boolean equalityKeyCompare(final Object key, final HashEntry<K, V> mapEntry) {
+ protected boolean equalityKeyCompare(final Object key, final HashEntry<K, V> mapEntry) {
return key == mapEntry.getKey();
}
@Override
- protected final boolean equalityCompare(final Object key, final Object mapKey) {
+ protected boolean equalityCompare(final Object key, final Object mapKey) {
return key == mapKey;
}
@Override
- protected final boolean equalityCompareWithNulls(final Object key, final Object mapKey) {
+ protected boolean equalityCompareWithNulls(final Object key, final Object mapKey) {
return key == mapKey;
}
}
@@ -1212,16 +1212,16 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- static final class DefaultHashEntryCreator<K, V> implements HashEntryCreator<K, V>, Serializable {
+ static class DefaultHashEntryCreator<K, V> implements HashEntryCreator<K, V>, Serializable {
private static final long serialVersionUID = 3765680607280951726L;
- public final HashEntry<K, V> newEntry(final K key, final int hash, final HashEntry<K, V> next,
+ public HashEntry<K, V> newEntry(final K key, final int hash, final HashEntry<K, V> next,
final V value) {
return new HashEntryImpl<K, V>(key, hash, next, value, null);
}
- public final int keyHashCode(final Object key, final boolean compareValues) {
+ public int keyHashCode(final Object key, final boolean compareValues) {
return keyHash(key, compareValues);
}
}
@@ -1284,7 +1284,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return <tt>true</tt> if this map contains no key-value mappings
*/
@Override
- public final boolean isEmpty() {
+ public boolean isEmpty() {
final Segment<K, V>[] segments = this.segments;
/*
* We keep track of per-segment modCounts to avoid ABA problems in which an element in one
@@ -1323,7 +1323,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
@Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UL_UNRELEASED_LOCK",
justification = "The lock() calls are followed by unlock() calls without finally-block. Leaving this as is because it's lifted from JDK code and we want to minimize changes.")
- public final int size() {
+ public int size() {
final Segment<K, V>[] segments = this.segments;
long sum = 0;
long check = 0;
@@ -1382,7 +1382,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final V get(final Object key) {
+ public V get(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).get(key, hash);
@@ -1397,7 +1397,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final boolean containsKey(final Object key) {
+ public boolean containsKey(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).containsKey(key, hash);
@@ -1415,7 +1415,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
@Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UL_UNRELEASED_LOCK",
justification = "Leaving this as is because it's lifted from JDK code and we want to minimize changes.")
- public final boolean containsValue(final Object value) {
+ public boolean containsValue(final Object value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1478,7 +1478,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* as determined by the <tt>equals</tt> method; <tt>false</tt> otherwise
* @throws NullPointerException if the specified value is null
*/
- public final boolean contains(final Object value) {
+ public boolean contains(final Object value) {
return containsValue(value);
}
@@ -1497,7 +1497,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key or value is null
*/
@Override
- public final V put(final K key, final V value) {
+ public V put(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1513,7 +1513,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* mapping for the key
* @throws NullPointerException if the specified key or value is null
*/
- public final V putIfAbsent(final K key, final V value) {
+ public V putIfAbsent(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1536,7 +1536,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final boolean create(final K key, final V value) {
+ public boolean create(final K key, final V value) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
final Segment<K, V> seg = segmentFor(hash);
@@ -1643,8 +1643,8 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key or value is null
*/
- public final <C, P> V create(final K key, final MapCallback<K, V, C, P> valueCreator,
- final C context, final P createParams, final boolean lockForRead) {
+ public <C, P> V create(final K key, final MapCallback<K, V, C, P> valueCreator, final C context,
+ final P createParams, final boolean lockForRead) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).create(key, hash, valueCreator, context, createParams, lockForRead);
@@ -1665,7 +1665,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final V get(final Object key, final MapCallback<K, V, ?, ?> readCallback) {
+ public V get(final Object key, final MapCallback<K, V, ?, ?> readCallback) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).get(key, hash, readCallback);
@@ -1704,8 +1704,8 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key or value is null, and this map does not
* permit null keys or values (optional)
*/
- public final <C, P> V removeConditionally(final Object key,
- final MapCallback<K, V, C, P> condition, final C context, final P removeParams) {
+ public <C, P> V removeConditionally(final Object key, final MapCallback<K, V, C, P> condition,
+ final C context, final P removeParams) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).remove(key, hash, NO_OBJECT_TOKEN, condition, context, removeParams);
@@ -1720,7 +1720,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @param m mappings to be stored in this map
*/
@Override
- public final void putAll(final Map<? extends K, ? extends V> m) {
+ public void putAll(final Map<? extends K, ? extends V> m) {
for (final Map.Entry<? extends K, ? extends V> e : m.entrySet()) {
put(e.getKey(), e.getValue());
}
@@ -1736,7 +1736,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @throws NullPointerException if the specified key is null
*/
@Override
- public final V remove(final Object key) {
+ public V remove(final Object key) {
// throws NullPointerException if key null
final int hash = this.entryCreator.keyHashCode(key, this.compareValues);
return segmentFor(hash).remove(key, hash, NO_OBJECT_TOKEN, null, null, null);
@@ -1747,7 +1747,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if the specified key is null
*/
- public final boolean remove(final Object key, final Object value) {
+ public boolean remove(final Object key, final Object value) {
if (value == null) {
return false;
}
@@ -1761,7 +1761,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @throws NullPointerException if any of the arguments are null
*/
- public final boolean replace(final K key, final V oldValue, final V newValue) {
+ public boolean replace(final K key, final V oldValue, final V newValue) {
if (oldValue == null || newValue == null) {
throw new NullPointerException();
}
@@ -1777,7 +1777,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* mapping for the key
* @throws NullPointerException if the specified key or value is null
*/
- public final V replace(final K key, final V value) {
+ public V replace(final K key, final V value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1790,7 +1790,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Removes all of the mappings from this map.
*/
@Override
- public final void clear() {
+ public void clear() {
ArrayList<HashEntry<?, ?>> entries = null;
try {
for (int i = 0; i < this.segments.length; ++i) {
@@ -1848,7 +1848,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Set<K> keySet() {
+ public Set<K> keySet() {
final Set<K> ks = this.keySet;
return (ks != null) ? ks : (this.keySet = new KeySet());
}
@@ -1868,7 +1868,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Collection<V> values() {
+ public Collection<V> values() {
final Collection<V> vs = this.values;
return (vs != null) ? vs : (this.values = new Values());
}
@@ -1887,7 +1887,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* modifications subsequent to construction.
*/
@Override
- public final Set<Map.Entry<K, V>> entrySet() {
+ public Set<Map.Entry<K, V>> entrySet() {
final Set<Map.Entry<K, V>> es = this.entrySet;
return (es != null) ? es : (this.entrySet = new EntrySet(false));
}
@@ -1911,7 +1911,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* This set provides entries that are reused during iteration so caller cannot store the returned
* <code>Map.Entry</code> objects.
*/
- public final Set<Map.Entry<K, V>> entrySetWithReusableEntries() {
+ public Set<Map.Entry<K, V>> entrySetWithReusableEntries() {
final Set<Map.Entry<K, V>> es = this.reusableEntrySet;
return (es != null) ? es : (this.reusableEntrySet = new EntrySet(true));
}
@@ -1924,7 +1924,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return an enumeration of the keys in this table
* @see #keySet()
*/
- public final Enumeration<K> keys() {
+ public Enumeration<K> keys() {
return new KeyIterator();
}
@@ -1934,7 +1934,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* @return an enumeration of the values in this table
* @see #values()
*/
- public final Enumeration<V> elements() {
+ public Enumeration<V> elements() {
return new ValueIterator();
}
@@ -1965,11 +1965,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
advance();
}
- public final boolean hasMoreElements() {
+ public boolean hasMoreElements() {
return hasNext();
}
- final void advance() {
+ void advance() {
// GemStone changes BEGIN
if (this.currentListIndex < this.currentList.size()) {
this.nextEntry = this.currentList.get(this.currentListIndex++);
@@ -2031,7 +2031,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* Read lock on {@link #currentSegmentIndex}'s listUpdateLock should already be acquired.
*/
- private final void copyEntriesToList() {
+ private void copyEntriesToList() {
assert segments[currentSegmentIndex] != null : "unexpected null currentSegment";
assert segments[currentSegmentIndex].listUpdateLock.getReadLockCount() > 0;
@@ -2042,11 +2042,11 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- public final boolean hasNext() {
+ public boolean hasNext() {
return this.nextEntry != null;
}
- final HashEntry<K, V> nextEntry() {
+ HashEntry<K, V> nextEntry() {
if (this.nextEntry == null) {
throw new NoSuchElementException();
}
@@ -2055,7 +2055,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
return this.lastReturned;
}
- public final void remove() {
+ public void remove() {
if (this.lastReturned == null) {
throw new IllegalStateException();
}
@@ -2064,7 +2064,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> {
+ class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> {
public K next() {
return super.nextEntry().getKey();
@@ -2075,7 +2075,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> {
+ class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> {
public V next() {
return super.nextEntry().getMapValue();
@@ -2126,7 +2126,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @return the key corresponding to this entry
*/
- public final K getKey() {
+ public K getKey() {
return this.key;
}
@@ -2135,7 +2135,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
*
* @return the value corresponding to this entry
*/
- public final V getValue() {
+ public V getValue() {
return this.value;
}
@@ -2223,7 +2223,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
* Custom Entry class used by EntryIterator.next(), that relays setValue changes to the underlying
* map.
*/
- final class WriteThroughEntry extends SimpleReusableEntry {
+ class WriteThroughEntry extends SimpleReusableEntry {
private static final long serialVersionUID = -6364816773849437756L;
@@ -2254,7 +2254,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class EntryIterator extends HashIterator implements Iterator<Map.Entry<K, V>> {
+ class EntryIterator extends HashIterator implements Iterator<Map.Entry<K, V>> {
// GemStone change
// added possibility to reuse a single Map.Entry for entire iteration
@@ -2276,7 +2276,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
// End GemStone change
}
- final class KeySet extends AbstractSet<K> {
+ class KeySet extends AbstractSet<K> {
@Override
public Iterator<K> iterator() {
@@ -2304,7 +2304,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class Values extends AbstractCollection<V> {
+ class Values extends AbstractCollection<V> {
@Override
public Iterator<V> iterator() {
@@ -2327,7 +2327,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V>
}
}
- final class EntrySet extends AbstractSet<Map.Entry<K, V>> {
+ class EntrySet extends AbstractSet<Map.Entry<K, V>> {
// GemStone change
// added possibility to reuse a single Map.Entry for entire iteration
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
index 936f602..767cf94 100644
--- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java
@@ -105,7 +105,7 @@ public abstract class CommandService {
* @param cache Underlying <code>Cache</code> instance to be used to create a Command Service.
* @throws CommandServiceException If command service could not be initialized.
*/
- public static final CommandService createLocalCommandService(Cache cache)
+ public static CommandService createLocalCommandService(Cache cache)
throws CommandServiceException {
if (cache == null || cache.isClosed()) {
throw new CacheClosedException(
@@ -136,7 +136,7 @@ public abstract class CommandService {
*
* @return A usable <code>CommandService</code> or null if one cannot be found.
*/
- public static final CommandService getUsableLocalCommandService() {
+ public static CommandService getUsableLocalCommandService() {
if (localCommandService != null && localCommandService.isUsable()) {
return localCommandService;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
index 99fb421..ecf8da2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AlertDetails.java
@@ -142,7 +142,7 @@ public class AlertDetails {
* @param intLevel int alert level to convert
* @return A string representation of the alert level
*/
- public static final String getAlertLevelAsString(final int intLevel) {
+ public static String getAlertLevelAsString(final int intLevel) {
if (intLevel == Alert.SEVERE) {
return "severe";
} else if (intLevel == Alert.ERROR) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
index cb203a0..624d6fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ArrayConverter.java
@@ -27,14 +27,14 @@ import javax.management.openmbean.OpenDataException;
*
*
*/
-public final class ArrayConverter extends OpenTypeConverter {
+public class ArrayConverter extends OpenTypeConverter {
ArrayConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
OpenTypeConverter elementConverter) {
super(targetType, openArrayType, openArrayClass);
this.elementConverter = elementConverter;
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
Object[] valueArray = (Object[]) value;
final int len = valueArray.length;
final Object[] openArray = (Object[]) Array.newInstance(getOpenClass().getComponentType(), len);
@@ -44,7 +44,7 @@ public final class ArrayConverter extends OpenTypeConverter {
return openArray;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final Object[] openArray = (Object[]) openValue;
final Type targetType = getTargetType();
final Object[] valueArray;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
index f469883..a3f6ad7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CollectionConverter.java
@@ -35,7 +35,7 @@ import javax.management.openmbean.OpenDataException;
*
*
*/
-public final class CollectionConverter extends OpenTypeConverter {
+public class CollectionConverter extends OpenTypeConverter {
CollectionConverter(Type targetType, ArrayType openArrayType, Class openArrayClass,
OpenTypeConverter elementConverter) {
super(targetType, openArrayType, openArrayClass);
@@ -60,7 +60,7 @@ public final class CollectionConverter extends OpenTypeConverter {
}
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
final Collection valueCollection = (Collection) value;
if (valueCollection instanceof SortedSet) {
Comparator comparator = ((SortedSet) valueCollection).comparator();
@@ -77,7 +77,7 @@ public final class CollectionConverter extends OpenTypeConverter {
return openArray;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final Object[] openArray = (Object[]) openValue;
final Collection<Object> valueCollection;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
index 51dc980..0ab3dfe 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/CompositeConverter.java
@@ -55,7 +55,7 @@ public class CompositeConverter extends OpenTypeConverter {
/**
* Converts to open value
*/
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
CompositeType ct = (CompositeType) getOpenType();
if (value instanceof CompositeDataView)
return ((CompositeDataView) value).toCompositeData(ct);
@@ -128,7 +128,7 @@ public class CompositeConverter extends OpenTypeConverter {
makeCompositeBuilder();
}
- public final Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
makeCompositeBuilder();
return compositeBuilder.fromCompositeData((CompositeData) value, itemNames, getterConverters);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
index 320e66f..f9e7547 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/EnumConverter.java
@@ -23,18 +23,18 @@ import javax.management.openmbean.SimpleType;
*
*
*/
-public final class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
+public class EnumConverter<T extends Enum<T>> extends OpenTypeConverter {
EnumConverter(Class<T> enumClass) {
super(enumClass, SimpleType.STRING, String.class);
this.enumClass = enumClass;
}
- final Object toNonNullOpenValue(Object value) {
+ Object toNonNullOpenValue(Object value) {
return ((Enum) value).name();
}
- public final Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object value) throws InvalidObjectException {
try {
return Enum.valueOf(enumClass, (String) value);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
index dcdb578..ce5ba45 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/IdentityConverter.java
@@ -24,7 +24,7 @@ import javax.management.openmbean.OpenType;
*
*
*/
-public final class IdentityConverter extends OpenTypeConverter {
+public class IdentityConverter extends OpenTypeConverter {
IdentityConverter(Type targetType, OpenType openType, Class openClass) {
super(targetType, openType, openClass);
}
@@ -37,7 +37,7 @@ public final class IdentityConverter extends OpenTypeConverter {
return value;
}
- public final Object fromNonNullOpenValue(Object value) {
+ public Object fromNonNullOpenValue(Object value) {
return value;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
index b7591db..e144717 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenMethod.java
@@ -108,15 +108,15 @@ public class OpenMethod {
return sig;
}
- final Object toOpenReturnValue(Object ret) throws OpenDataException {
+ Object toOpenReturnValue(Object ret) throws OpenDataException {
return returnTypeConverter.toOpenValue(ret);
}
- final Object fromOpenReturnValue(Object ret) throws InvalidObjectException {
+ Object fromOpenReturnValue(Object ret) throws InvalidObjectException {
return returnTypeConverter.fromOpenValue(ret);
}
- final Object[] toOpenParameters(Object[] params) throws OpenDataException {
+ Object[] toOpenParameters(Object[] params) throws OpenDataException {
if (paramConversionIsIdentity || params == null)
return params;
final Object[] oparams = new Object[params.length];
@@ -125,7 +125,7 @@ public class OpenMethod {
return oparams;
}
- final Object[] fromOpenParameters(Object[] params) throws InvalidObjectException {
+ Object[] fromOpenParameters(Object[] params) throws InvalidObjectException {
if (paramConversionIsIdentity || params == null)
return params;
final Object[] jparams = new Object[params.length];
@@ -134,11 +134,11 @@ public class OpenMethod {
return jparams;
}
- final Object toOpenParameter(Object param, int paramNo) throws OpenDataException {
+ Object toOpenParameter(Object param, int paramNo) throws OpenDataException {
return paramTypeConverters[paramNo].toOpenValue(param);
}
- final Object fromOpenParameter(Object param, int paramNo) throws InvalidObjectException {
+ Object fromOpenParameter(Object param, int paramNo) throws InvalidObjectException {
return paramTypeConverters[paramNo].fromOpenValue(param);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
index 6a0b842..4fdf291 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/OpenTypeConverter.java
@@ -91,8 +91,7 @@ public abstract class OpenTypeConverter {
private final Class openClass;
- private static final class ConverterMap
- extends WeakHashMap<Type, WeakReference<OpenTypeConverter>> {
+ private static class ConverterMap extends WeakHashMap<Type, WeakReference<OpenTypeConverter>> {
}
private static final ConverterMap converterMap = new ConverterMap();
@@ -118,7 +117,7 @@ public abstract class OpenTypeConverter {
* @return the java type object
* @throws InvalidObjectException
*/
- public final Object fromOpenValue(Object value) throws InvalidObjectException {
+ public Object fromOpenValue(Object value) throws InvalidObjectException {
if (value == null)
return null;
else
@@ -144,7 +143,7 @@ public abstract class OpenTypeConverter {
* @return open class object
* @throws OpenDataException
*/
- final Object toOpenValue(Object value) throws OpenDataException {
+ Object toOpenValue(Object value) throws OpenDataException {
if (value == null)
return null;
else
@@ -162,15 +161,15 @@ public abstract class OpenTypeConverter {
return false;
}
- final Type getTargetType() {
+ Type getTargetType() {
return targetType;
}
- final OpenType getOpenType() {
+ OpenType getOpenType() {
return openType;
}
- final Class getOpenClass() {
+ Class getOpenClass() {
return openClass;
}
@@ -513,7 +512,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaFrom extends CompositeBuilder {
+ protected static class CompositeBuilderViaFrom extends CompositeBuilder {
CompositeBuilderViaFrom(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
@@ -595,8 +594,7 @@ public abstract class OpenTypeConverter {
return possibleCause;
}
- final Object fromCompositeData(CompositeData cd, String[] itemNames,
- OpenTypeConverter[] converters) {
+ Object fromCompositeData(CompositeData cd, String[] itemNames, OpenTypeConverter[] converters) {
throw new Error();
}
@@ -669,7 +667,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaConstructor extends CompositeBuilder {
+ protected static class CompositeBuilderViaConstructor extends CompositeBuilder {
CompositeBuilderViaConstructor(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
@@ -853,7 +851,7 @@ public abstract class OpenTypeConverter {
*
*
*/
- protected static final class CompositeBuilderViaProxy extends CompositeBuilder {
+ protected static class CompositeBuilderViaProxy extends CompositeBuilder {
CompositeBuilderViaProxy(Class targetClass, String[] itemNames) {
super(targetClass, itemNames);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
index c674e48..fc8eb97 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java
@@ -59,7 +59,7 @@ import org.apache.geode.management.membership.MembershipListener;
*
* @since GemFire 7.0
*/
-public final class SystemManagementService extends BaseManagementService {
+public class SystemManagementService extends BaseManagementService {
private static final Logger logger = LogService.getLogger();
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
index b5e4ca3..8d41c5a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/TableConverter.java
@@ -34,7 +34,7 @@ import javax.management.openmbean.TabularType;
*
*
*/
-public final class TableConverter extends OpenTypeConverter {
+public class TableConverter extends OpenTypeConverter {
TableConverter(Type targetType, boolean sortedMap, TabularType tabularType,
OpenTypeConverter keyConverter, OpenTypeConverter valueConverter) {
super(targetType, tabularType, TabularData.class);
@@ -43,7 +43,7 @@ public final class TableConverter extends OpenTypeConverter {
this.valueConverter = valueConverter;
}
- final Object toNonNullOpenValue(Object value) throws OpenDataException {
+ Object toNonNullOpenValue(Object value) throws OpenDataException {
final Map<Object, Object> valueMap = (Map<Object, Object>) value;
if (valueMap instanceof SortedMap) {
Comparator comparator = ((SortedMap) valueMap).comparator();
@@ -68,7 +68,7 @@ public final class TableConverter extends OpenTypeConverter {
return table;
}
- public final Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
+ public Object fromNonNullOpenValue(Object openValue) throws InvalidObjectException {
final TabularData table = (TabularData) openValue;
final Collection<CompositeData> rows = (Collection<CompositeData>) table.values();
final Map<Object, Object> valueMap =
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
index 6d22a8f..dd24942 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java
@@ -28,7 +28,7 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
*
*
*/
-public final class VMStatsMonitor extends MBeanStatsMonitor {
+public class VMStatsMonitor extends MBeanStatsMonitor {
private volatile float cpuUsage = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
index c5c73dc..e4e00da 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java
@@ -73,7 +73,7 @@ import joptsimple.OptionSet;
*
* @since GemFire 7.0
*/
-public final class Launcher {
+public class Launcher {
private static final String EXECUTE_OPTION = "execute";
private static final String HELP_OPTION = "help";
private static final String HELP = CliStrings.HELP;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
index 0cf7078..4018beb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -57,7 +57,7 @@ import java.util.Set;
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
* @since GemFire 7.0
*/
-public final class DeployCommands extends AbstractCommandsSupport {
+public class DeployCommands extends AbstractCommandsSupport {
private final DeployFunction deployFunction = new DeployFunction();
private final UndeployFunction undeployFunction = new UndeployFunction();
@@ -75,7 +75,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliMetaData(
interceptor = "org.apache.geode.management.internal.cli.commands.DeployCommands$Interceptor",
relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
- public final Result deploy(
+ public Result deploy(
@CliOption(key = {CliStrings.DEPLOY__GROUP}, help = CliStrings.DEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
@CliOption(key = {CliStrings.DEPLOY__JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
@@ -153,7 +153,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliCommand(value = {CliStrings.UNDEPLOY}, help = CliStrings.UNDEPLOY__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
- public final Result undeploy(
+ public Result undeploy(
@CliOption(key = {CliStrings.UNDEPLOY__GROUP}, help = CliStrings.UNDEPLOY__GROUP__HELP,
optionContext = ConverterHint.MEMBERGROUP) String[] groups,
@CliOption(key = {CliStrings.UNDEPLOY__JAR}, help = CliStrings.UNDEPLOY__JAR__HELP,
@@ -223,7 +223,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
@CliCommand(value = {CliStrings.LIST_DEPLOYED}, help = CliStrings.LIST_DEPLOYED__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
- public final Result listDeployed(@CliOption(key = {CliStrings.LIST_DEPLOYED__GROUP},
+ public Result listDeployed(@CliOption(key = {CliStrings.LIST_DEPLOYED__GROUP},
help = CliStrings.LIST_DEPLOYED__GROUP__HELP) String group) {
try {
@@ -277,7 +277,7 @@ public final class DeployCommands extends AbstractCommandsSupport {
}
@CliAvailabilityIndicator({CliStrings.DEPLOY, CliStrings.UNDEPLOY, CliStrings.LIST_DEPLOYED})
- public final boolean isConnected() {
+ public boolean isConnected() {
if (!CliUtil.isGfshVM()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index d61e72d..101bae4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -2614,7 +2614,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
return true;
}
- protected static final class LauncherSignalListener implements SignalListener {
+ protected static class LauncherSignalListener implements SignalListener {
private volatile boolean signaled = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
index f8d27de..29627f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusCommands.java
@@ -83,7 +83,7 @@ public class StatusCommands extends AbstractCommandsSupport implements CommandMa
}
@CliAvailabilityIndicator({CliStrings.STATUS_SHARED_CONFIG})
- public final boolean isConnected() {
+ public boolean isConnected() {
if (!CliUtil.isGfshVM()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
index 575930b..c175e1a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportedLogsSizeInfo.java
@@ -22,7 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Objects;
-public final class ExportedLogsSizeInfo implements DataSerializable {
+public class ExportedLogsSizeInfo implements DataSerializable {
private long logsSize;
private long diskAvailable;
private long diskSize;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
index 049a3d6..1cbb9e2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/RegionAttributesDefault.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.internal.cli.domain.PartitionAttributesInfo;
* Contains the default values for the region attributes
*
*/
-public final class RegionAttributesDefault {
+public class RegionAttributesDefault {
public static final Scope SCOPE = AbstractRegion.DEFAULT_SCOPE.DISTRIBUTED_NO_ACK;
public static final DataPolicy DATA_POLICY = DataPolicy.DEFAULT;
public static final boolean CLONING_ENABLED = false;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
index 8ecf6a7..7450757 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/CacheElement.java
@@ -132,7 +132,7 @@ public class CacheElement {
* @throws IOException if unable to open {@link InputSource}.
* @since GemFire 8.1
*/
- private static final InputSource resolveSchema(final Map<String, List<String>> schemaLocationMap,
+ private static InputSource resolveSchema(final Map<String, List<String>> schemaLocationMap,
String namespaceUri) throws IOException {
final EntityResolver2 entityResolver = new CacheXmlParser();
@@ -170,8 +170,8 @@ public class CacheElement {
* @throws XPathExpressionException
* @since GemFire 8.1
*/
- private static final void buildElementMapCacheType(
- final LinkedHashMap<String, CacheElement> elementMap, final InputSource inputSource)
+ private static void buildElementMapCacheType(final LinkedHashMap<String, CacheElement> elementMap,
+ final InputSource inputSource)
throws SAXException, IOException, ParserConfigurationException, XPathExpressionException {
final Document doc = XmlUtils.getDocumentBuilder().parse(inputSource);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index f740dde..be74e84 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -174,7 +174,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @since GemFire 8.1
*/
- private final void init() {
+ private void init() {
Assert.assertTrue(!StringUtils.isBlank(type));
Assert.assertTrue(!StringUtils.isBlank(prefix));
Assert.assertTrue(!StringUtils.isBlank(namespace));
@@ -190,7 +190,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @return XML string representation of the entity.
*/
- private final String loadXmlDefinition() {
+ private String loadXmlDefinition() {
final Cache cache = CacheFactory.getAnyInstance();
final StringWriter stringWriter = new StringWriter();
@@ -208,7 +208,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @return XML for {@link XmlEntity} if found, otherwise <code>null</code>.
* @since GemFire 8.1
*/
- private final String loadXmlDefinition(final String xmlDocument) {
+ private String loadXmlDefinition(final String xmlDocument) {
final Cache cache = CacheFactory.getAnyInstance();
try {
InputSource inputSource = new InputSource(new StringReader(xmlDocument));
@@ -229,7 +229,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @throws TransformerFactoryConfigurationError
* @since GemFire 8.1
*/
- private final String loadXmlDefinition(final Document document)
+ private String loadXmlDefinition(final Document document)
throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
final Cache cache = CacheFactory.getAnyInstance();
@@ -446,7 +446,7 @@ public class XmlEntity implements VersionedDataSerializable {
* @return new {@link XmlEntityBuilder}.
* @since GemFire 8.1
*/
- public static final XmlEntityBuilder builder() {
+ public static XmlEntityBuilder builder() {
return new XmlEntityBuilder();
}
@@ -461,7 +461,7 @@ public class XmlEntity implements VersionedDataSerializable {
*
* @since GemFire 8.1
*/
- public static final class XmlEntityBuilder {
+ public static class XmlEntityBuilder {
private XmlEntity xmlEntity;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
index 4a0579a..b00e287 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlConstants.java
@@ -21,7 +21,7 @@ import javax.xml.XMLConstants;
*
* @since GemFire 8.1
*/
-public final class XmlConstants {
+public class XmlConstants {
/**
* Standard prefix for {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
index a6fafaa..218762c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
@@ -281,8 +281,7 @@ public class XmlUtils {
* @return {@link Map} of schema namespace URIs to location URLs.
* @since GemFire 8.1
*/
- public static final Map<String, List<String>> buildSchemaLocationMap(
- final String schemaLocation) {
+ public static Map<String, List<String>> buildSchemaLocationMap(final String schemaLocation) {
return buildSchemaLocationMap(new HashMap<String, List<String>>(), schemaLocation);
}
@@ -298,7 +297,7 @@ public class XmlUtils {
* @return {@link Map} of schema namespace URIs to location URLs.
* @since GemFire 8.1
*/
- static final Map<String, List<String>> buildSchemaLocationMap(
+ static Map<String, List<String>> buildSchemaLocationMap(
Map<String, List<String>> schemaLocationMap, final String schemaLocation) {
if (null == schemaLocation) {
return schemaLocationMap;
@@ -419,14 +418,14 @@ public class XmlUtils {
return transform(transformer, doc);
}
- public static final String elementToString(Node element)
+ public static String elementToString(Node element)
throws TransformerFactoryConfigurationError, TransformerException {
Transformer transformer = TransformerFactory.newInstance().newTransformer();
return transform(transformer, element);
}
- private static final String transform(Transformer transformer, Node element)
+ private static String transform(Transformer transformer, Node element)
throws TransformerException {
StreamResult result = new StreamResult(new StringWriter());
DOMSource source = new DOMSource(element);
@@ -585,8 +584,7 @@ public class XmlUtils {
* @param schemaLocationMap {@link Map} to get schema locations from.
* @since GemFire 8.1
*/
- private static final String getSchemaLocationValue(
- final Map<String, List<String>> schemaLocationMap) {
+ private static String getSchemaLocationValue(final Map<String, List<String>> schemaLocationMap) {
final StringBuilder sb = new StringBuilder();
for (final Map.Entry<String, List<String>> entry : schemaLocationMap.entrySet()) {
for (final String schemaLocation : entry.getValue()) {
@@ -606,7 +604,7 @@ public class XmlUtils {
* @return {@link Map} of namespace URIs to prefixes.
* @since GemFire 8.1
*/
- private static final Map<String, String> buildNamespacePrefixMap(final Element root) {
+ private static Map<String, String> buildNamespacePrefixMap(final Element root) {
final HashMap<String, String> namespacePrefixMap = new HashMap<>();
// Look for all of the attributes of cache that start with
@@ -646,7 +644,7 @@ public class XmlUtils {
* @return the modified version of the passed in node.
* @since GemFire 8.1
*/
- static final Node changeNamespace(final Node node, final String oldNamespaceUri,
+ static Node changeNamespace(final Node node, final String oldNamespaceUri,
final String newNamespaceUri) throws XPathExpressionException {
Node result = null;
final NodeList nodes = query(node, "//*");
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
index e782dc0..d4aa268 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/io/MultipartFileResourceAdapter.java
@@ -41,7 +41,7 @@ public class MultipartFileResourceAdapter extends AbstractResource {
this.file = file;
}
- protected final MultipartFile getMultipartFile() {
+ protected MultipartFile getMultipartFile() {
return file;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
index 25f972e..b342c66 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/AbstractHttpOperationInvoker.java
@@ -362,7 +362,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* @return an instance of the ScheduledExecutorService for scheduling periodic or delayed tasks.
* @see java.util.concurrent.ScheduledExecutorService
*/
- protected final ScheduledExecutorService getExecutorService() {
+ protected ScheduledExecutorService getExecutorService() {
assertState(this.executorService != null,
"The ExecutorService for this HTTP OperationInvoker (%1$s) was not properly initialized!",
getClass().getName());
@@ -377,7 +377,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* OperationInvoker to process commands.
* @see org.apache.geode.management.internal.cli.shell.Gfsh
*/
- protected final Gfsh getGfsh() {
+ protected Gfsh getGfsh() {
return this.gfsh;
}
@@ -388,7 +388,7 @@ public abstract class AbstractHttpOperationInvoker implements HttpOperationInvok
* @return an instance of the Spring RestTemplate used to make REST API web service calls.
* @see org.springframework.web.client.RestTemplate
*/
- protected final RestTemplate getRestTemplate() {
+ protected RestTemplate getRestTemplate() {
return this.restTemplate;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
index b8e7506..a87948e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/support/HttpInvocationHandler.java
@@ -47,11 +47,11 @@ public class HttpInvocationHandler implements InvocationHandler {
this.objectName = objectName;
}
- protected final ObjectName getObjectName() {
+ protected ObjectName getObjectName() {
return objectName;
}
- protected final HttpOperationInvoker getOperationInvoker() {
+ protected HttpOperationInvoker getOperationInvoker() {
return operationInvoker;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
index 2f2d0e3..e5de960 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/ReflectionBasedAutoSerializer.java
@@ -247,7 +247,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* @param patterns the list of definitions to apply
* @deprecated as of 6.6.2 use {@link #reconfigure(String...)} instead.
*/
- public final void setSerializableClasses(List<String> patterns) {
+ public void setSerializableClasses(List<String> patterns) {
reconfigure(listToArray(patterns));
}
@@ -288,7 +288,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* @param patterns the definitions to apply
* @since GemFire 6.6.2
*/
- public final void reconfigure(String... patterns) {
+ public void reconfigure(String... patterns) {
reconfigure(false, patterns);
}
@@ -330,7 +330,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
* throw an exception if the object it not portable to non-java languages.
* @since GemFire 6.6.2
*/
- public final void reconfigure(boolean checkPortability, String... patterns) {
+ public void reconfigure(boolean checkPortability, String... patterns) {
this.manager.reconfigure(checkPortability, patterns);
}
@@ -570,7 +570,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
*
* @since GemFire 6.6.2
*/
- public final RegionService getRegionService() {
+ public RegionService getRegionService() {
return this.manager.getRegionService();
}
@@ -579,7 +579,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
*
* @since GemFire 8.2
*/
- public final Object getManager() {
+ public Object getManager() {
// The result is not AutoSerializableManager because
// that class is not part of our public APIs.
return this.manager;
[33/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
GEODE-2929: remove superfluous uses of final from internal classes
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a4458531
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a4458531
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a4458531
Branch: refs/heads/feature/GEODE-2580
Commit: a44585316a8d7eed35917c1dfd829315b34ce316
Parents: f18e1d2
Author: Kirk Lund <kl...@apache.org>
Authored: Mon May 15 14:56:59 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue May 16 12:07:34 2017 -0700
----------------------------------------------------------------------
.../admin/internal/AbstractHealthEvaluator.java | 4 +-
.../internal/AdminDistributedSystemImpl.java | 2 +-
.../internal/DistributedSystemConfigImpl.java | 2 +-
.../SystemMemberCacheEventProcessor.java | 2 +-
.../geode/admin/internal/SystemMemberImpl.java | 26 +--
.../geode/cache/DiskWriteAttributesFactory.java | 2 +-
.../geode/cache/client/internal/AbstractOp.java | 8 +-
.../client/internal/ClientMetadataService.java | 4 +-
.../cache/client/internal/ConnectionStats.java | 4 +-
.../geode/cache/client/internal/PoolImpl.java | 2 +-
.../geode/cache/client/internal/PutOp.java | 2 +-
.../cache/client/internal/QueueStateImpl.java | 6 +-
.../operations/internal/UpdateOnlyMap.java | 5 +-
.../cache/query/internal/ObjectIntHashMap.java | 20 +--
.../query/internal/QueryObserverHolder.java | 8 +-
.../internal/ResultsCollectionWrapper.java | 2 +-
.../geode/cache/query/internal/ResultsSet.java | 2 +-
.../cache/query/internal/SortedResultSet.java | 2 +-
.../cache/query/internal/SortedStructSet.java | 2 +-
.../geode/cache/query/internal/StructBag.java | 10 +-
.../geode/cache/query/internal/StructSet.java | 6 +-
.../geode/cache/query/internal/Undefined.java | 2 +-
.../query/internal/index/HashIndexSet.java | 8 +-
.../cache/query/internal/types/MapTypeImpl.java | 2 +-
.../query/internal/types/StructTypeImpl.java | 2 +-
.../apache/geode/cache/wan/EventSequenceID.java | 2 +-
.../geode/compression/SnappyCompressor.java | 2 +-
.../geode/distributed/LocatorLauncher.java | 4 +-
.../geode/distributed/ServerLauncher.java | 2 +-
.../internal/AbstractDistributionConfig.java | 2 +-
.../internal/DistributionAdvisor.java | 16 +-
.../internal/DistributionConfigSnapshot.java | 2 +-
.../internal/DistributionManager.java | 18 +--
.../internal/DistributionMessage.java | 6 +-
.../internal/DistributionMessageObserver.java | 5 +-
.../FunctionExecutionPooledExecutor.java | 4 +-
.../internal/HighPriorityAckedMessage.java | 2 +-
.../internal/InternalDistributedSystem.java | 12 +-
.../internal/LocatorLoadSnapshot.java | 4 +-
.../distributed/internal/LocatorStats.java | 16 +-
.../internal/PooledDistributionMessage.java | 2 +-
.../internal/PooledExecutorWithDMStats.java | 4 +-
.../distributed/internal/ProductUseLog.java | 2 +-
.../internal/ReliableReplyProcessor21.java | 4 +-
.../distributed/internal/ReplyMessage.java | 6 +-
.../distributed/internal/ReplyProcessor21.java | 14 +-
.../internal/RuntimeDistributionConfigImpl.java | 2 +-
.../internal/SerialAckedMessage.java | 3 +-
.../SerialQueuedExecutorWithDMStats.java | 4 +-
.../distributed/internal/ServerLocation.java | 4 +-
.../distributed/internal/ShutdownMessage.java | 2 +-
.../distributed/internal/StartupMessage.java | 3 +-
.../internal/direct/DirectChannel.java | 5 +-
.../internal/locks/DLockQueryProcessor.java | 4 +-
.../locks/DLockRecoverGrantorProcessor.java | 4 +-
.../internal/locks/DLockReleaseProcessor.java | 4 +-
.../internal/locks/DLockService.java | 16 +-
.../internal/locks/DeposeGrantorProcessor.java | 2 +-
.../internal/locks/DistributedMemberLock.java | 2 +-
.../internal/locks/ElderInitProcessor.java | 4 +-
.../distributed/internal/locks/ElderState.java | 8 +-
.../distributed/internal/locks/GrantorInfo.java | 12 +-
.../internal/locks/GrantorRequestProcessor.java | 10 +-
.../locks/NonGrantorDestroyedProcessor.java | 4 +-
.../membership/InternalDistributedMember.java | 4 +-
.../membership/gms/messenger/JGAddress.java | 8 +-
.../membership/gms/mgr/LocalViewMessage.java | 4 +-
.../internal/streaming/StreamingOperation.java | 2 +-
.../geode/internal/ByteArrayDataInput.java | 42 ++---
.../geode/internal/ByteBufferOutputStream.java | 12 +-
.../geode/internal/ExternalizableDSFID.java | 4 +-
.../geode/internal/GfeConsoleReaderFactory.java | 4 +-
.../geode/internal/HeapDataOutputStream.java | 69 ++++----
.../geode/internal/InternalDataSerializer.java | 8 +-
.../geode/internal/InternalInstantiator.java | 2 +-
.../geode/internal/NullDataOutputStream.java | 30 ++--
.../geode/internal/ObjIdConcurrentMap.java | 39 +++--
.../org/apache/geode/internal/PureJavaMode.java | 8 +-
.../org/apache/geode/internal/SetUtils.java | 2 +-
.../org/apache/geode/internal/SystemAdmin.java | 2 +-
.../java/org/apache/geode/internal/Version.java | 28 ++--
.../internal/VersionedDataInputStream.java | 2 +-
.../internal/VersionedDataOutputStream.java | 5 +-
.../geode/internal/VersionedObjectInput.java | 2 +-
.../geode/internal/VersionedObjectOutput.java | 2 +-
.../admin/remote/AddHealthListenerRequest.java | 2 +-
.../admin/remote/AddHealthListenerResponse.java | 2 +-
.../admin/remote/AddStatListenerRequest.java | 2 +-
.../admin/remote/AddStatListenerResponse.java | 2 +-
.../remote/AdminConsoleDisconnectMessage.java | 2 +-
.../admin/remote/AdminConsoleMessage.java | 2 +-
.../admin/remote/AdminFailureResponse.java | 2 +-
.../admin/remote/AlertLevelChangeMessage.java | 2 +-
.../admin/remote/AlertListenerMessage.java | 3 +-
.../admin/remote/AppCacheSnapshotMessage.java | 2 +-
.../admin/remote/BridgeServerRequest.java | 2 +-
.../admin/remote/BridgeServerResponse.java | 2 +-
.../admin/remote/CacheConfigRequest.java | 2 +-
.../admin/remote/CacheConfigResponse.java | 2 +-
.../internal/admin/remote/CacheDisplay.java | 2 +-
.../internal/admin/remote/CacheInfoRequest.java | 2 +-
.../admin/remote/CacheInfoResponse.java | 2 +-
.../admin/remote/CancelStatListenerRequest.java | 2 +-
.../remote/CancelStatListenerResponse.java | 2 +-
.../admin/remote/CancellationMessage.java | 2 +-
.../admin/remote/DestroyEntryMessage.java | 2 +-
.../admin/remote/DestroyRegionMessage.java | 2 +-
.../admin/remote/FetchDistLockInfoRequest.java | 2 +-
.../admin/remote/FetchDistLockInfoResponse.java | 2 +-
.../remote/FetchHealthDiagnosisRequest.java | 2 +-
.../remote/FetchHealthDiagnosisResponse.java | 2 +-
.../internal/admin/remote/FetchHostRequest.java | 2 +-
.../admin/remote/FetchHostResponse.java | 2 +-
.../remote/FetchResourceAttributesRequest.java | 2 +-
.../remote/FetchResourceAttributesResponse.java | 2 +-
.../admin/remote/FetchStatsRequest.java | 2 +-
.../admin/remote/FetchStatsResponse.java | 2 +-
.../admin/remote/FetchSysCfgRequest.java | 2 +-
.../admin/remote/FetchSysCfgResponse.java | 2 +-
.../remote/FlushAppCacheSnapshotMessage.java | 2 +-
.../admin/remote/HealthListenerMessage.java | 3 +-
.../admin/remote/LicenseInfoRequest.java | 2 +-
.../admin/remote/LicenseInfoResponse.java | 2 +-
.../admin/remote/ObjectDetailsRequest.java | 2 +-
.../admin/remote/ObjectDetailsResponse.java | 2 +-
.../admin/remote/ObjectNamesRequest.java | 2 +-
.../admin/remote/ObjectNamesResponse.java | 2 +-
.../admin/remote/RegionAttributesRequest.java | 2 +-
.../admin/remote/RegionAttributesResponse.java | 2 +-
.../internal/admin/remote/RegionRequest.java | 2 +-
.../internal/admin/remote/RegionResponse.java | 2 +-
.../admin/remote/RegionSizeRequest.java | 2 +-
.../admin/remote/RegionSizeResponse.java | 2 +-
.../admin/remote/RegionStatisticsRequest.java | 2 +-
.../admin/remote/RegionStatisticsResponse.java | 2 +-
.../admin/remote/RemoteApplicationVM.java | 2 +-
.../admin/remote/RemoteGfManagerAgent.java | 2 +-
.../admin/remote/RemoteRegionAttributes.java | 4 +-
.../remote/RemoveHealthListenerRequest.java | 2 +-
.../remote/RemoveHealthListenerResponse.java | 2 +-
.../admin/remote/ResetHealthStatusRequest.java | 2 +-
.../admin/remote/ResetHealthStatusResponse.java | 2 +-
.../admin/remote/RootRegionRequest.java | 2 +-
.../admin/remote/RootRegionResponse.java | 2 +-
.../admin/remote/SnapshotResultMessage.java | 3 +-
.../admin/remote/StatListenerMessage.java | 3 +-
.../admin/remote/StoreSysCfgRequest.java | 2 +-
.../admin/remote/StoreSysCfgResponse.java | 2 +-
.../internal/admin/remote/SubRegionRequest.java | 2 +-
.../admin/remote/SubRegionResponse.java | 2 +-
.../internal/admin/remote/TailLogRequest.java | 2 +-
.../internal/admin/remote/TailLogResponse.java | 2 +-
.../admin/remote/VersionInfoRequest.java | 2 +-
.../admin/remote/VersionInfoResponse.java | 2 +-
.../admin/statalerts/BaseDecoratorImpl.java | 6 +-
.../admin/statalerts/FunctionDecoratorImpl.java | 2 +-
.../admin/statalerts/FunctionHelper.java | 8 +-
.../statalerts/GaugeThresholdDecoratorImpl.java | 2 +-
.../statalerts/MultiAttrDefinitionImpl.java | 2 +-
.../NumberThresholdDecoratorImpl.java | 2 +-
.../statalerts/SingleAttrDefinitionImpl.java | 2 +-
.../internal/cache/AbstractDiskRegion.java | 8 +-
.../internal/cache/AbstractLRURegionMap.java | 36 ++---
.../cache/AbstractOplogDiskRegionEntry.java | 16 +-
.../geode/internal/cache/AbstractRegion.java | 12 +-
.../geode/internal/cache/AbstractRegionMap.java | 68 ++++----
.../internal/cache/AbstractUpdateOperation.java | 2 +-
.../geode/internal/cache/BucketAdvisor.java | 10 +-
.../geode/internal/cache/BucketRegion.java | 8 +-
.../cache/BytesAndBitsForCompactor.java | 8 +-
.../internal/cache/CacheObserverHolder.java | 4 +-
.../internal/cache/CacheServerLauncher.java | 2 +-
.../internal/cache/ClientRegionEventImpl.java | 2 +-
.../cache/ClientServerObserverHolder.java | 4 +-
.../geode/internal/cache/CloseCacheMessage.java | 3 +-
.../internal/cache/CreateRegionProcessor.java | 4 +-
.../geode/internal/cache/DestroyOperation.java | 2 +-
.../cache/DestroyPartitionedRegionMessage.java | 2 +-
.../internal/cache/DestroyRegionOperation.java | 4 +-
.../apache/geode/internal/cache/DiskRegion.java | 32 ++--
.../geode/internal/cache/DiskStoreImpl.java | 30 ++--
.../internal/cache/DiskWriteAttributesImpl.java | 2 +-
.../internal/cache/DistPeerTXStateStub.java | 7 +-
.../internal/cache/DistTXCommitMessage.java | 4 +-
.../internal/cache/DistTXPrecommitMessage.java | 8 +-
.../internal/cache/DistTXRollbackMessage.java | 6 +-
.../cache/DistTXStateOnCoordinator.java | 9 +-
.../cache/DistributedCacheOperation.java | 4 +-
.../cache/DistributedClearOperation.java | 4 +-
.../cache/DistributedPutAllOperation.java | 6 +-
.../geode/internal/cache/DistributedRegion.java | 4 +-
...stributedRegionFunctionStreamingMessage.java | 4 +-
.../cache/DistributedRemoveAllOperation.java | 4 +-
.../apache/geode/internal/cache/EntriesSet.java | 2 +-
.../geode/internal/cache/EntryEventImpl.java | 64 ++++----
.../geode/internal/cache/EntryExpiryTask.java | 2 +-
.../internal/cache/EvictionAttributesImpl.java | 6 +-
.../apache/geode/internal/cache/ExpiryTask.java | 18 +--
.../FunctionStreamingOrderedReplyMessage.java | 2 +-
.../geode/internal/cache/GridAdvisor.java | 8 +-
.../apache/geode/internal/cache/HARegion.java | 8 +-
.../internal/cache/InitialImageOperation.java | 14 +-
.../geode/internal/cache/InlineKeyHelper.java | 2 +-
.../internal/cache/InternalRegionArguments.java | 2 +-
.../internal/cache/InvalidateOperation.java | 2 +-
.../cache/InvalidateRegionOperation.java | 2 +-
.../apache/geode/internal/cache/KeyInfo.java | 12 +-
.../geode/internal/cache/LeafRegionEntry.cpp | 79 ++++-----
.../geode/internal/cache/LocalRegion.java | 4 +-
.../org/apache/geode/internal/cache/Node.java | 2 +-
.../internal/cache/NonLocalRegionEntry.java | 4 +-
.../org/apache/geode/internal/cache/OpType.java | 2 +-
.../geode/internal/cache/OverflowOplogSet.java | 14 +-
.../geode/internal/cache/PRQueryProcessor.java | 6 +-
.../internal/cache/PartitionRegionConfig.java | 8 +-
.../cache/PartitionedRegionDataStore.java | 16 +-
.../internal/cache/PartitionedRegionStats.java | 2 +-
.../internal/cache/PersistentOplogSet.java | 12 +-
.../apache/geode/internal/cache/PoolStats.java | 18 +--
.../cache/PreferBytesCachedDeserializable.java | 2 +-
.../geode/internal/cache/ProxyBucketRegion.java | 6 +-
.../geode/internal/cache/ProxyRegionMap.java | 2 +-
.../geode/internal/cache/RegionExpiryTask.java | 18 +--
.../internal/cache/RegionIdleExpiryTask.java | 2 +-
.../internal/cache/RegionTTLExpiryTask.java | 2 +-
.../cache/RemoteContainsKeyValueMessage.java | 4 +-
.../internal/cache/RemoteDestroyMessage.java | 12 +-
.../internal/cache/RemoteFetchEntryMessage.java | 4 +-
.../cache/RemoteFetchVersionMessage.java | 4 +-
.../geode/internal/cache/RemoteGetMessage.java | 10 +-
.../internal/cache/RemoteInvalidateMessage.java | 4 +-
.../internal/cache/RemotePutAllMessage.java | 13 +-
.../geode/internal/cache/RemotePutMessage.java | 34 ++--
.../internal/cache/RemoteRegionOperation.java | 4 +-
.../internal/cache/RemoteRemoveAllMessage.java | 11 +-
.../geode/internal/cache/RoleEventImpl.java | 2 +-
.../cache/SearchLoadAndWriteProcessor.java | 16 +-
.../internal/cache/StateFlushOperation.java | 7 +-
.../apache/geode/internal/cache/TXEntry.java | 4 +-
.../geode/internal/cache/TXEntryState.java | 42 ++---
.../internal/cache/TXFarSideCMTracker.java | 20 +--
.../org/apache/geode/internal/cache/TXId.java | 2 +-
.../internal/cache/TXRemoteCommitMessage.java | 2 +-
.../geode/internal/cache/TXReservationMgr.java | 2 +-
.../apache/geode/internal/cache/TXState.java | 2 +-
.../geode/internal/cache/TXStateProxyImpl.java | 6 +-
.../org/apache/geode/internal/cache/Token.java | 12 +-
.../internal/cache/UnsharedImageState.java | 2 +-
.../cache/UpdateAttributesProcessor.java | 4 +-
.../geode/internal/cache/UpdateOperation.java | 4 +-
.../internal/cache/VMCachedDeserializable.java | 2 +-
.../geode/internal/cache/VMLRURegionMap.java | 10 +-
.../geode/internal/cache/VMRegionMap.java | 2 +-
.../VMStatsDiskLRURegionEntryHeapIntKey.java | 145 +++++++++++------
.../VMStatsDiskLRURegionEntryHeapLongKey.java | 143 ++++++++++------
.../VMStatsDiskLRURegionEntryHeapObjectKey.java | 141 ++++++++++------
...VMStatsDiskLRURegionEntryHeapStringKey1.java | 141 ++++++++++------
...VMStatsDiskLRURegionEntryHeapStringKey2.java | 140 ++++++++++------
.../VMStatsDiskLRURegionEntryHeapUUIDKey.java | 144 +++++++++++------
.../VMStatsDiskLRURegionEntryOffHeapIntKey.java | 153 ++++++++++++------
...VMStatsDiskLRURegionEntryOffHeapLongKey.java | 151 +++++++++++------
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 150 +++++++++++------
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 150 +++++++++++------
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 149 +++++++++++------
...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java | 152 +++++++++++------
.../cache/VMStatsDiskRegionEntryHeapIntKey.java | 85 +++++++---
.../VMStatsDiskRegionEntryHeapLongKey.java | 83 +++++++---
.../VMStatsDiskRegionEntryHeapObjectKey.java | 82 +++++++---
.../VMStatsDiskRegionEntryHeapStringKey1.java | 83 +++++++---
.../VMStatsDiskRegionEntryHeapStringKey2.java | 82 +++++++---
.../VMStatsDiskRegionEntryHeapUUIDKey.java | 84 +++++++---
.../VMStatsDiskRegionEntryOffHeapIntKey.java | 93 ++++++++---
.../VMStatsDiskRegionEntryOffHeapLongKey.java | 91 ++++++++---
.../VMStatsDiskRegionEntryOffHeapObjectKey.java | 90 ++++++++---
...VMStatsDiskRegionEntryOffHeapStringKey1.java | 90 ++++++++---
...VMStatsDiskRegionEntryOffHeapStringKey2.java | 89 +++++++---
.../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 92 ++++++++---
.../cache/VMStatsLRURegionEntryHeapIntKey.java | 132 ++++++++++-----
.../cache/VMStatsLRURegionEntryHeapLongKey.java | 130 ++++++++++-----
.../VMStatsLRURegionEntryHeapObjectKey.java | 130 ++++++++++-----
.../VMStatsLRURegionEntryHeapStringKey1.java | 130 +++++++++------
.../VMStatsLRURegionEntryHeapStringKey2.java | 129 +++++++++------
.../cache/VMStatsLRURegionEntryHeapUUIDKey.java | 129 ++++++++++-----
.../VMStatsLRURegionEntryOffHeapIntKey.java | 140 +++++++++++-----
.../VMStatsLRURegionEntryOffHeapLongKey.java | 138 +++++++++++-----
.../VMStatsLRURegionEntryOffHeapObjectKey.java | 138 +++++++++++-----
.../VMStatsLRURegionEntryOffHeapStringKey1.java | 137 +++++++++++-----
.../VMStatsLRURegionEntryOffHeapStringKey2.java | 136 +++++++++++-----
.../VMStatsLRURegionEntryOffHeapUUIDKey.java | 137 +++++++++++-----
.../cache/VMStatsRegionEntryHeapIntKey.java | 73 +++++++--
.../cache/VMStatsRegionEntryHeapLongKey.java | 71 ++++++--
.../cache/VMStatsRegionEntryHeapObjectKey.java | 71 ++++++--
.../cache/VMStatsRegionEntryHeapStringKey1.java | 71 ++++++--
.../cache/VMStatsRegionEntryHeapStringKey2.java | 70 ++++++--
.../cache/VMStatsRegionEntryHeapUUIDKey.java | 70 ++++++--
.../cache/VMStatsRegionEntryOffHeapIntKey.java | 81 ++++++++--
.../cache/VMStatsRegionEntryOffHeapLongKey.java | 79 +++++++--
.../VMStatsRegionEntryOffHeapObjectKey.java | 79 +++++++--
.../VMStatsRegionEntryOffHeapStringKey1.java | 78 +++++++--
.../VMStatsRegionEntryOffHeapStringKey2.java | 77 +++++++--
.../cache/VMStatsRegionEntryOffHeapUUIDKey.java | 78 +++++++--
.../VMThinDiskLRURegionEntryHeapIntKey.java | 123 +++++++++-----
.../VMThinDiskLRURegionEntryHeapLongKey.java | 121 +++++++++-----
.../VMThinDiskLRURegionEntryHeapObjectKey.java | 119 +++++++++-----
.../VMThinDiskLRURegionEntryHeapStringKey1.java | 119 +++++++++-----
.../VMThinDiskLRURegionEntryHeapStringKey2.java | 118 +++++++++-----
.../VMThinDiskLRURegionEntryHeapUUIDKey.java | 122 +++++++++-----
.../VMThinDiskLRURegionEntryOffHeapIntKey.java | 131 ++++++++++-----
.../VMThinDiskLRURegionEntryOffHeapLongKey.java | 129 ++++++++++-----
...MThinDiskLRURegionEntryOffHeapObjectKey.java | 128 ++++++++++-----
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 128 ++++++++++-----
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 127 ++++++++++-----
.../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 130 ++++++++++-----
.../cache/VMThinDiskRegionEntryHeapIntKey.java | 62 +++++--
.../cache/VMThinDiskRegionEntryHeapLongKey.java | 60 +++++--
.../VMThinDiskRegionEntryHeapObjectKey.java | 59 +++++--
.../VMThinDiskRegionEntryHeapStringKey1.java | 60 +++++--
.../VMThinDiskRegionEntryHeapStringKey2.java | 59 +++++--
.../cache/VMThinDiskRegionEntryHeapUUIDKey.java | 61 +++++--
.../VMThinDiskRegionEntryOffHeapIntKey.java | 70 ++++++--
.../VMThinDiskRegionEntryOffHeapLongKey.java | 68 ++++++--
.../VMThinDiskRegionEntryOffHeapObjectKey.java | 67 ++++++--
.../VMThinDiskRegionEntryOffHeapStringKey1.java | 67 ++++++--
.../VMThinDiskRegionEntryOffHeapStringKey2.java | 66 ++++++--
.../VMThinDiskRegionEntryOffHeapUUIDKey.java | 69 ++++++--
.../cache/VMThinLRURegionEntryHeapIntKey.java | 110 ++++++++-----
.../cache/VMThinLRURegionEntryHeapLongKey.java | 108 ++++++++-----
.../VMThinLRURegionEntryHeapObjectKey.java | 108 ++++++++-----
.../VMThinLRURegionEntryHeapStringKey1.java | 108 ++++++++-----
.../VMThinLRURegionEntryHeapStringKey2.java | 107 +++++++-----
.../cache/VMThinLRURegionEntryHeapUUIDKey.java | 107 +++++++-----
.../VMThinLRURegionEntryOffHeapIntKey.java | 118 +++++++++-----
.../VMThinLRURegionEntryOffHeapLongKey.java | 116 ++++++++-----
.../VMThinLRURegionEntryOffHeapObjectKey.java | 116 ++++++++-----
.../VMThinLRURegionEntryOffHeapStringKey1.java | 115 ++++++++-----
.../VMThinLRURegionEntryOffHeapStringKey2.java | 114 ++++++++-----
.../VMThinLRURegionEntryOffHeapUUIDKey.java | 115 ++++++++-----
.../cache/VMThinRegionEntryHeapIntKey.java | 50 +++++-
.../cache/VMThinRegionEntryHeapLongKey.java | 48 +++++-
.../cache/VMThinRegionEntryHeapObjectKey.java | 48 +++++-
.../cache/VMThinRegionEntryHeapStringKey1.java | 48 ++++--
.../cache/VMThinRegionEntryHeapStringKey2.java | 47 ++++--
.../cache/VMThinRegionEntryHeapUUIDKey.java | 47 +++++-
.../cache/VMThinRegionEntryOffHeapIntKey.java | 58 ++++++-
.../cache/VMThinRegionEntryOffHeapLongKey.java | 56 ++++++-
.../VMThinRegionEntryOffHeapObjectKey.java | 56 ++++++-
.../VMThinRegionEntryOffHeapStringKey1.java | 55 ++++++-
.../VMThinRegionEntryOffHeapStringKey2.java | 54 ++++++-
.../cache/VMThinRegionEntryOffHeapUUIDKey.java | 55 ++++++-
...sionedStatsDiskLRURegionEntryHeapIntKey.java | 153 ++++++++++++------
...ionedStatsDiskLRURegionEntryHeapLongKey.java | 151 +++++++++++------
...nedStatsDiskLRURegionEntryHeapObjectKey.java | 150 +++++++++++------
...edStatsDiskLRURegionEntryHeapStringKey1.java | 150 +++++++++++------
...edStatsDiskLRURegionEntryHeapStringKey2.java | 149 +++++++++++------
...ionedStatsDiskLRURegionEntryHeapUUIDKey.java | 152 +++++++++++------
...nedStatsDiskLRURegionEntryOffHeapIntKey.java | 162 +++++++++++++------
...edStatsDiskLRURegionEntryOffHeapLongKey.java | 160 ++++++++++++------
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 159 ++++++++++++------
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 159 ++++++++++++------
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 158 ++++++++++++------
...edStatsDiskLRURegionEntryOffHeapUUIDKey.java | 161 ++++++++++++------
...VersionedStatsDiskRegionEntryHeapIntKey.java | 93 ++++++++---
...ersionedStatsDiskRegionEntryHeapLongKey.java | 91 ++++++++---
...sionedStatsDiskRegionEntryHeapObjectKey.java | 90 ++++++++---
...ionedStatsDiskRegionEntryHeapStringKey1.java | 90 ++++++++---
...ionedStatsDiskRegionEntryHeapStringKey2.java | 89 +++++++---
...ersionedStatsDiskRegionEntryHeapUUIDKey.java | 92 ++++++++---
...sionedStatsDiskRegionEntryOffHeapIntKey.java | 102 +++++++++---
...ionedStatsDiskRegionEntryOffHeapLongKey.java | 100 +++++++++---
...nedStatsDiskRegionEntryOffHeapObjectKey.java | 99 +++++++++---
...edStatsDiskRegionEntryOffHeapStringKey1.java | 99 +++++++++---
...edStatsDiskRegionEntryOffHeapStringKey2.java | 98 ++++++++---
...ionedStatsDiskRegionEntryOffHeapUUIDKey.java | 101 +++++++++---
.../VersionedStatsLRURegionEntryHeapIntKey.java | 141 ++++++++++------
...VersionedStatsLRURegionEntryHeapLongKey.java | 138 ++++++++++------
...rsionedStatsLRURegionEntryHeapObjectKey.java | 138 ++++++++++------
...sionedStatsLRURegionEntryHeapStringKey1.java | 137 ++++++++++------
...sionedStatsLRURegionEntryHeapStringKey2.java | 136 ++++++++++------
...VersionedStatsLRURegionEntryHeapUUIDKey.java | 137 ++++++++++------
...rsionedStatsLRURegionEntryOffHeapIntKey.java | 149 +++++++++++------
...sionedStatsLRURegionEntryOffHeapLongKey.java | 147 +++++++++++------
...onedStatsLRURegionEntryOffHeapObjectKey.java | 147 +++++++++++------
...nedStatsLRURegionEntryOffHeapStringKey1.java | 146 +++++++++++------
...nedStatsLRURegionEntryOffHeapStringKey2.java | 145 +++++++++++------
...sionedStatsLRURegionEntryOffHeapUUIDKey.java | 146 +++++++++++------
.../VersionedStatsRegionEntryHeapIntKey.java | 82 ++++++++--
.../VersionedStatsRegionEntryHeapLongKey.java | 80 +++++++--
.../VersionedStatsRegionEntryHeapObjectKey.java | 79 +++++++--
...VersionedStatsRegionEntryHeapStringKey1.java | 78 +++++++--
...VersionedStatsRegionEntryHeapStringKey2.java | 77 +++++++--
.../VersionedStatsRegionEntryHeapUUIDKey.java | 79 +++++++--
.../VersionedStatsRegionEntryOffHeapIntKey.java | 90 +++++++++--
...VersionedStatsRegionEntryOffHeapLongKey.java | 88 ++++++++--
...rsionedStatsRegionEntryOffHeapObjectKey.java | 88 ++++++++--
...sionedStatsRegionEntryOffHeapStringKey1.java | 87 ++++++++--
...sionedStatsRegionEntryOffHeapStringKey2.java | 86 ++++++++--
...VersionedStatsRegionEntryOffHeapUUIDKey.java | 87 ++++++++--
...rsionedThinDiskLRURegionEntryHeapIntKey.java | 131 ++++++++++-----
...sionedThinDiskLRURegionEntryHeapLongKey.java | 129 ++++++++++-----
...onedThinDiskLRURegionEntryHeapObjectKey.java | 128 ++++++++++-----
...nedThinDiskLRURegionEntryHeapStringKey1.java | 128 ++++++++++-----
...nedThinDiskLRURegionEntryHeapStringKey2.java | 127 ++++++++++-----
...sionedThinDiskLRURegionEntryHeapUUIDKey.java | 130 ++++++++++-----
...onedThinDiskLRURegionEntryOffHeapIntKey.java | 140 +++++++++++-----
...nedThinDiskLRURegionEntryOffHeapLongKey.java | 138 +++++++++++-----
...dThinDiskLRURegionEntryOffHeapObjectKey.java | 137 +++++++++++-----
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 137 +++++++++++-----
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 136 +++++++++++-----
...nedThinDiskLRURegionEntryOffHeapUUIDKey.java | 139 +++++++++++-----
.../VersionedThinDiskRegionEntryHeapIntKey.java | 71 ++++++--
...VersionedThinDiskRegionEntryHeapLongKey.java | 68 ++++++--
...rsionedThinDiskRegionEntryHeapObjectKey.java | 67 ++++++--
...sionedThinDiskRegionEntryHeapStringKey1.java | 67 ++++++--
...sionedThinDiskRegionEntryHeapStringKey2.java | 66 ++++++--
...VersionedThinDiskRegionEntryHeapUUIDKey.java | 69 ++++++--
...rsionedThinDiskRegionEntryOffHeapIntKey.java | 79 +++++++--
...sionedThinDiskRegionEntryOffHeapLongKey.java | 77 +++++++--
...onedThinDiskRegionEntryOffHeapObjectKey.java | 76 +++++++--
...nedThinDiskRegionEntryOffHeapStringKey1.java | 76 +++++++--
...nedThinDiskRegionEntryOffHeapStringKey2.java | 75 +++++++--
...sionedThinDiskRegionEntryOffHeapUUIDKey.java | 78 +++++++--
.../VersionedThinLRURegionEntryHeapIntKey.java | 119 +++++++++-----
.../VersionedThinLRURegionEntryHeapLongKey.java | 116 ++++++++-----
...ersionedThinLRURegionEntryHeapObjectKey.java | 116 ++++++++-----
...rsionedThinLRURegionEntryHeapStringKey1.java | 115 ++++++++-----
...rsionedThinLRURegionEntryHeapStringKey2.java | 114 ++++++++-----
.../VersionedThinLRURegionEntryHeapUUIDKey.java | 115 ++++++++-----
...ersionedThinLRURegionEntryOffHeapIntKey.java | 127 ++++++++++-----
...rsionedThinLRURegionEntryOffHeapLongKey.java | 125 +++++++++-----
...ionedThinLRURegionEntryOffHeapObjectKey.java | 125 +++++++++-----
...onedThinLRURegionEntryOffHeapStringKey1.java | 124 +++++++++-----
...onedThinLRURegionEntryOffHeapStringKey2.java | 123 +++++++++-----
...rsionedThinLRURegionEntryOffHeapUUIDKey.java | 124 +++++++++-----
.../VersionedThinRegionEntryHeapIntKey.java | 59 +++++--
.../VersionedThinRegionEntryHeapLongKey.java | 57 +++++--
.../VersionedThinRegionEntryHeapObjectKey.java | 56 +++++--
.../VersionedThinRegionEntryHeapStringKey1.java | 55 +++++--
.../VersionedThinRegionEntryHeapStringKey2.java | 54 +++++--
.../VersionedThinRegionEntryHeapUUIDKey.java | 56 +++++--
.../VersionedThinRegionEntryOffHeapIntKey.java | 67 ++++++--
.../VersionedThinRegionEntryOffHeapLongKey.java | 65 ++++++--
...ersionedThinRegionEntryOffHeapObjectKey.java | 65 ++++++--
...rsionedThinRegionEntryOffHeapStringKey1.java | 64 ++++++--
...rsionedThinRegionEntryOffHeapStringKey2.java | 63 ++++++--
.../VersionedThinRegionEntryOffHeapUUIDKey.java | 64 ++++++--
.../cache/control/HeapMemoryMonitor.java | 2 +-
.../cache/control/MemoryThresholds.java | 2 +-
.../cache/execute/AbstractExecution.java | 21 ++-
.../cache/execute/FunctionContextImpl.java | 2 +-
.../execute/MemberFunctionResultSender.java | 2 +-
.../geode/internal/cache/execute/NoResult.java | 2 +-
.../PartitionedRegionFunctionResultSender.java | 2 +-
.../internal/cache/ha/QueueRemovalMessage.java | 2 +-
.../geode/internal/cache/locks/TXLockBatch.java | 2 +-
.../internal/cache/locks/TXLockIdImpl.java | 6 +-
.../locks/TXLockUpdateParticipantsMessage.java | 4 +-
.../locks/TXOriginatorRecoveryProcessor.java | 4 +-
.../internal/cache/lru/HeapLRUStatistics.java | 4 +-
.../cache/lru/LRUCapacityController.java | 2 +-
.../cache/lru/MemLRUCapacityController.java | 2 +-
.../internal/cache/lru/NewLRUClockHand.java | 4 +-
.../AllBucketProfilesUpdateMessage.java | 4 +-
.../partitioned/BecomePrimaryBucketMessage.java | 6 +-
.../cache/partitioned/BucketBackupMessage.java | 2 +-
.../partitioned/BucketProfileUpdateMessage.java | 5 +-
.../cache/partitioned/BucketSizeMessage.java | 6 +-
.../partitioned/ContainsKeyValueMessage.java | 4 +-
.../cache/partitioned/CreateBucketMessage.java | 6 +-
.../partitioned/CreateMissingBucketsTask.java | 2 +-
.../partitioned/DeposePrimaryBucketMessage.java | 2 +-
.../cache/partitioned/DestroyMessage.java | 8 +-
.../DestroyRegionOnDataStoreMessage.java | 6 +-
.../partitioned/DumpAllPRConfigMessage.java | 2 +-
.../cache/partitioned/DumpB2NRegion.java | 4 +-
.../cache/partitioned/DumpBucketsMessage.java | 2 +-
.../partitioned/EndBucketCreationMessage.java | 4 +-
.../partitioned/FetchBulkEntriesMessage.java | 4 +-
.../cache/partitioned/FetchEntriesMessage.java | 4 +-
.../cache/partitioned/FetchEntryMessage.java | 4 +-
.../cache/partitioned/FetchKeysMessage.java | 4 +-
.../FetchPartitionDetailsMessage.java | 2 +-
.../cache/partitioned/FlushMessage.java | 2 +-
.../internal/cache/partitioned/GetMessage.java | 10 +-
.../partitioned/IdentityRequestMessage.java | 4 +-
.../partitioned/IdentityUpdateMessage.java | 2 +-
.../cache/partitioned/IndexCreationMsg.java | 14 +-
.../cache/partitioned/InterestEventMessage.java | 6 +-
.../cache/partitioned/InvalidateMessage.java | 4 +-
.../partitioned/ManageBackupBucketMessage.java | 6 +-
.../cache/partitioned/ManageBucketMessage.java | 6 +-
.../cache/partitioned/MoveBucketMessage.java | 2 +-
.../internal/cache/partitioned/PRLoad.java | 2 +-
.../cache/partitioned/PRSanityCheckMessage.java | 2 +-
.../cache/partitioned/PRTombstoneMessage.java | 6 +-
.../PRUpdateEntryVersionMessage.java | 2 +-
.../cache/partitioned/PartitionMessage.java | 12 +-
...rtitionedRegionFunctionStreamingMessage.java | 2 +-
.../PartitionedRegionObserverHolder.java | 4 +-
.../partitioned/PrimaryRequestMessage.java | 4 +-
.../internal/cache/partitioned/PutMessage.java | 28 ++--
.../cache/partitioned/QueryMessage.java | 2 +-
.../cache/partitioned/RegionAdvisor.java | 16 +-
.../cache/partitioned/RemoteSizeMessage.java | 6 +-
.../cache/partitioned/RemoveAllPRMessage.java | 14 +-
.../cache/partitioned/RemoveBucketMessage.java | 2 +-
.../cache/partitioned/RemoveIndexesMessage.java | 14 +-
.../internal/cache/partitioned/SizeMessage.java | 4 +-
.../cache/persistence/BytesAndBits.java | 4 +-
.../persistence/MembershipViewRequest.java | 2 +-
.../snapshot/RegionSnapshotServiceImpl.java | 4 +-
.../cache/tier/InternalClientMembership.java | 2 +-
.../cache/tier/sockets/BaseCommand.java | 2 +-
.../tier/sockets/CacheClientNotifierStats.java | 24 +--
.../tier/sockets/CacheClientProxyStats.java | 4 +-
.../tier/sockets/ClientInstantiatorMessage.java | 2 +-
.../tier/sockets/ClientMarkerMessageImpl.java | 2 +-
.../tier/sockets/ClientPingMessageImpl.java | 2 +-
.../internal/cache/tier/sockets/HandShake.java | 2 +-
.../tier/sockets/InterestResultPolicyImpl.java | 2 +-
.../internal/cache/tier/sockets/Message.java | 2 +-
.../geode/internal/cache/tier/sockets/Part.java | 4 +-
.../cache/tier/sockets/ServerConnection.java | 2 +-
.../tier/sockets/UnregisterAllInterest.java | 2 +-
.../cache/vmotion/VMotionObserverHolder.java | 4 +-
.../cache/wan/AbstractGatewaySender.java | 14 +-
.../AbstractGatewaySenderEventProcessor.java | 4 +-
.../cache/wan/GatewaySenderAdvisor.java | 2 +-
.../wan/GatewaySenderEventCallbackArgument.java | 2 +-
.../parallel/ParallelGatewaySenderQueue.java | 12 +-
.../ParallelQueueBatchRemovalMessage.java | 2 +-
.../wan/serial/SerialGatewaySenderQueue.java | 12 +-
.../geode/internal/cache/xmlcache/CacheXml.java | 16 +-
.../cache/xmlcache/GeodeEntityResolver.java | 2 +-
.../cache/xmlcache/PivotalEntityResolver.java | 2 +-
.../cache/xmlcache/XmlGeneratorUtils.java | 2 +-
.../geode/internal/concurrent/AtomicLong5.java | 2 +-
.../concurrent/CompactConcurrentHashSet2.java | 82 +++++-----
.../geode/internal/logging/DateFormatter.java | 2 +-
.../geode/internal/logging/GemFireHandler.java | 2 +-
.../geode/internal/logging/PureLogWriter.java | 4 +-
.../internal/logging/SecurityLogWriter.java | 2 +-
.../logging/SecurityManagerLogWriter.java | 2 +-
.../internal/logging/log4j/AlertAppender.java | 2 +-
.../logging/log4j/LocalizedMessage.java | 10 +-
.../logging/log4j/LogWriterAppender.java | 2 +-
.../internal/logging/log4j/LogWriterLogger.java | 2 +-
.../logging/log4j/ThreadIdPatternConverter.java | 2 +-
.../GemFireParameterizedMessageFactory.java | 2 +-
.../geode/internal/net/SocketCreator.java | 2 +-
.../apache/geode/internal/offheap/DataType.java | 2 +-
.../geode/internal/offheap/FreeListManager.java | 2 +-
.../internal/process/AttachProcessUtils.java | 2 +-
.../process/BlockingProcessStreamReader.java | 2 +-
...usterConfigurationNotAvailableException.java | 2 +-
.../process/ConnectionFailedException.java | 2 +-
.../internal/process/ControlFileWatchdog.java | 2 +-
.../internal/process/ControllableProcess.java | 2 +-
.../process/FileAlreadyExistsException.java | 2 +-
.../process/LocalProcessController.java | 2 +-
.../internal/process/LocalProcessLauncher.java | 2 +-
.../process/MBeanInvocationFailedException.java | 2 +-
.../process/MBeanProcessController.java | 2 +-
.../internal/process/NativeProcessUtils.java | 2 +-
.../process/NonBlockingProcessStreamReader.java | 2 +-
.../process/PidUnavailableException.java | 2 +-
.../process/ProcessControllerFactory.java | 2 +-
.../process/ProcessLauncherContext.java | 2 +-
.../ProcessTerminatedAbnormallyException.java | 2 +-
.../geode/internal/process/ProcessUtils.java | 2 +-
.../UnableToControlProcessException.java | 2 +-
.../geode/internal/shared/NativeCalls.java | 6 +-
.../internal/shared/NativeCallsJNAImpl.java | 10 +-
.../internal/shared/NativeErrorException.java | 2 +-
.../apache/geode/internal/shared/OSType.java | 2 +-
.../statistics/AbstractStatisticsFactory.java | 74 ++++-----
.../internal/statistics/CounterMonitor.java | 2 +-
.../statistics/DummyStatisticsImpl.java | 80 ++++-----
.../geode/internal/statistics/GaugeMonitor.java | 2 +-
.../internal/statistics/GemFireStatSampler.java | 30 ++--
.../internal/statistics/HostStatSampler.java | 40 ++---
.../statistics/LocalStatisticsImpl.java | 26 +--
.../internal/statistics/SampleCollector.java | 2 +-
.../internal/statistics/SimpleStatisticId.java | 6 +-
.../internal/statistics/StatArchiveReader.java | 2 +-
.../internal/statistics/StatArchiveWriter.java | 34 ++--
.../statistics/StatisticDescriptorImpl.java | 36 ++---
.../internal/statistics/StatisticsImpl.java | 86 +++++-----
.../statistics/StatisticsTypeFactoryImpl.java | 4 +-
.../internal/statistics/StatisticsTypeImpl.java | 10 +-
.../statistics/platform/ProcessStats.java | 4 +-
.../stats50/Atomic50StatisticsImpl.java | 50 +++---
.../internal/tcp/ByteBufferInputStream.java | 16 +-
.../apache/geode/internal/tcp/Connection.java | 20 +--
.../geode/internal/tcp/MsgDestreamer.java | 6 +-
.../geode/internal/tcp/MsgOutputStream.java | 34 ++--
.../apache/geode/internal/tcp/MsgStreamer.java | 52 +++---
.../geode/internal/tcp/MsgStreamerList.java | 2 +-
.../internal/tcp/VersionedMsgStreamer.java | 4 +-
.../geode/internal/util/CollectionUtils.java | 4 +-
.../geode/internal/util/TransformUtils.java | 2 +-
.../CustomEntryConcurrentHashMap.java | 146 ++++++++---------
.../geode/management/cli/CommandService.java | 4 +-
.../geode/management/internal/AlertDetails.java | 2 +-
.../management/internal/ArrayConverter.java | 6 +-
.../internal/CollectionConverter.java | 6 +-
.../management/internal/CompositeConverter.java | 4 +-
.../management/internal/EnumConverter.java | 6 +-
.../management/internal/IdentityConverter.java | 4 +-
.../geode/management/internal/OpenMethod.java | 12 +-
.../management/internal/OpenTypeConverter.java | 22 ++-
.../internal/SystemManagementService.java | 2 +-
.../management/internal/TableConverter.java | 6 +-
.../internal/beans/stats/VMStatsMonitor.java | 2 +-
.../geode/management/internal/cli/Launcher.java | 2 +-
.../internal/cli/commands/DeployCommands.java | 10 +-
.../cli/commands/LauncherLifecycleCommands.java | 2 +-
.../internal/cli/commands/StatusCommands.java | 2 +-
.../cli/functions/ExportedLogsSizeInfo.java | 2 +-
.../cli/util/RegionAttributesDefault.java | 2 +-
.../configuration/domain/CacheElement.java | 6 +-
.../configuration/domain/XmlEntity.java | 12 +-
.../configuration/utils/XmlConstants.java | 2 +-
.../internal/configuration/utils/XmlUtils.java | 16 +-
.../web/io/MultipartFileResourceAdapter.java | 2 +-
.../web/shell/AbstractHttpOperationInvoker.java | 6 +-
.../shell/support/HttpInvocationHandler.java | 4 +-
.../pdx/ReflectionBasedAutoSerializer.java | 10 +-
.../pdx/internal/AutoSerializableManager.java | 48 +++---
.../apache/geode/redis/GeodeRedisServer.java | 2 +-
.../org/apache/geode/redis/internal/Coder.java | 31 ++--
.../geode/redis/internal/RegionProvider.java | 8 +-
.../internal/executor/hll/HllExecutor.java | 2 +-
.../redis/internal/executor/hll/Varint.java | 2 +-
.../internal/executor/list/ListExecutor.java | 2 +-
.../executor/sortedset/ZRangeByLexExecutor.java | 2 +-
.../executor/string/StringExecutor.java | 2 +-
.../security/GemFireSecurityException.java | 6 +-
.../ClientServerRegisterInterestsDUnitTest.java | 2 +-
.../management/MemoryThresholdsDUnitTest.java | 2 +-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 2 +-
.../PRColocatedEquiJoinDUnitTest.java | 4 +-
.../query/partitioned/PRQueryDUnitHelper.java | 2 +-
.../geode/cache/snapshot/SnapshotDUnitTest.java | 2 +-
.../cache30/ClientMembershipDUnitTest.java | 2 +-
.../geode/codeAnalysis/decode/cp/CpUtf8.java | 2 +-
.../geode/distributed/AbstractLauncherTest.java | 2 +-
.../geode/distributed/ServerLauncherTest.java | 2 +-
.../distributed/internal/Bug40751DUnitTest.java | 2 +-
.../auth/AbstractGMSAuthenticatorTestCase.java | 16 +-
.../StreamingOperationManyDUnitTest.java | 2 +-
.../StreamingOperationOneDUnitTest.java | 2 +-
.../disttx/DistributedTransactionDUnitTest.java | 10 +-
...wardCompatibilitySerializationDUnitTest.java | 2 +-
.../apache/geode/internal/cache/TestDelta.java | 2 +-
.../extension/mock/MockCacheExtension.java | 2 +-
.../mock/MockCacheExtensionXmlGenerator.java | 2 +-
.../extension/mock/MockRegionExtension.java | 2 +-
.../mock/MockRegionExtensionXmlGenerator.java | 2 +-
.../cache/partitioned/Bug39356DUnitTest.java | 3 +-
.../PersistentPartitionedRegionDUnitTest.java | 3 +-
...treamingPartitionOperationManyDUnitTest.java | 2 +-
...StreamingPartitionOperationOneDUnitTest.java | 2 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 2 +-
.../ParallelQueueRemovalMessageJUnitTest.java | 2 +-
.../xmlcache/AbstractXmlParserJUnitTest.java | 2 +-
.../compression/CompressionStatsDUnitTest.java | 4 +-
.../internal/lang/ObjectUtilsJUnitTest.java | 2 +-
.../internal/lang/ThreadUtilsJUnitTest.java | 2 +-
.../offheap/LifecycleListenerJUnitTest.java | 2 +-
...tractSignalNotificationHandlerJUnitTest.java | 3 +-
.../geode/internal/util/IOUtilsJUnitTest.java | 2 +-
.../util/concurrent/cm/LoopHelpers.java | 6 +-
...ersalMembershipListenerAdapterDUnitTest.java | 2 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 2 +-
.../management/internal/cli/domain/Stock.java | 2 +-
.../DeltaClientAuthorizationDUnitTest.java | 2 +-
.../geode/security/SecurityTestUtils.java | 2 +-
.../generator/AuthzCredentialGenerator.java | 2 +-
.../security/generator/CredentialGenerator.java | 2 +-
.../cache/internal/JUnit4CacheTestCase.java | 2 +-
.../cache/query/internal/cq/CqConflatable.java | 20 +--
.../cache/query/internal/cq/CqServiceImpl.java | 2 +-
.../internal/directory/FileIndexInput.java | 2 +-
.../internal/filesystem/FileInputStream.java | 2 +-
.../internal/filesystem/FileOutputStream.java | 2 +-
.../internal/xml/LuceneServiceXmlGenerator.java | 2 +-
.../filesystem/FileSystemJUnitTest.java | 4 +-
.../tools/pulse/tests/ui/PulseTestUtils.java | 2 +-
.../internal/locator/wan/LocatorDiscovery.java | 2 +-
...stomMappingJackson2HttpMessageConverter.java | 5 +-
.../LoginHandlerInterceptorJUnitTest.java | 3 +-
.../RestHttpOperationInvokerJUnitTest.java | 2 +-
.../SimpleHttpOperationInvokerJUnitTest.java | 2 +-
693 files changed, 16295 insertions(+), 7137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
index 57b42a8..14235b9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
@@ -70,7 +70,7 @@ public abstract class AbstractHealthEvaluator {
* @param status A list of {@link AbstractHealthEvaluator.HealthStatus HealthStatus} objects that
* is populated when ill health is detected.
*/
- public final void evaluate(List status) {
+ public void evaluate(List status) {
this.numEvaluations++;
check(status);
}
@@ -85,7 +85,7 @@ public abstract class AbstractHealthEvaluator {
/**
* Returns whether or not this is the first evaluation
*/
- protected final boolean isFirstEvaluation() {
+ protected boolean isFirstEvaluation() {
return this.numEvaluations <= 1;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index ed0c015..9cd9ce3 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -1813,7 +1813,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
*
* @see #createGemFireHealth
*/
- public final GemFireHealth getGemFireHealth() {
+ public GemFireHealth getGemFireHealth() {
synchronized (this) {
if (this.health == null || this.health.isClosed()) {
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 7a75612..ae9f3c8 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -638,7 +638,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
private static final String ILLEGAL_REMOTE_COMMAND_RSH_OR_SSH =
"Allowed remote commands include \"rsh {HOST} {CMD}\" or \"ssh {HOST} {CMD}\" with valid rsh or ssh switches. Invalid: ";
- private final void checkRemoteCommand(final String remoteCommand) {
+ private void checkRemoteCommand(final String remoteCommand) {
if (remoteCommand == null || remoteCommand.isEmpty()) {
return;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
index 8afafdb..012388b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
@@ -74,7 +74,7 @@ public class SystemMemberCacheEventProcessor {
}
- public static final class SystemMemberCacheMessage extends HighPriorityDistributionMessage {
+ public static class SystemMemberCacheMessage extends HighPriorityDistributionMessage {
protected String regionPath;
protected Operation op;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
index 1e2d2a7..da09903 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
@@ -132,19 +132,19 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
return new DistributionConfigImpl(props);
}
- public final AdminDistributedSystem getDistributedSystem() {
+ public AdminDistributedSystem getDistributedSystem() {
return this.system;
}
- public final InternalDistributedMember getInternalId() {
+ public InternalDistributedMember getInternalId() {
return internalId;
}
- public final String getId() {
+ public String getId() {
return this.id;
}
- public final String getName() {
+ public String getName() {
return this.name;
}
@@ -152,7 +152,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
return this.host;
}
- public final InetAddress getHostAddress() {
+ public InetAddress getHostAddress() {
return InetAddressUtil.toInetAddress(this.getHost());
}
@@ -160,7 +160,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
// Operations
// -------------------------------------------------------------------------
- public final String getLog() {
+ public String getLog() {
String childTail = null;
String mainTail = null;
GemFireVM vm = getGemFireVM();
@@ -189,14 +189,14 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
}
}
- public final java.util.Properties getLicense() {
+ public java.util.Properties getLicense() {
GemFireVM vm = getGemFireVM();
if (vm == null)
return null;
return new Properties();
}
- public final String getVersion() {
+ public String getVersion() {
GemFireVM vm = getGemFireVM();
if (vm == null)
return null;
@@ -220,7 +220,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
return statsImpl;
}
- public final boolean hasCache() {
+ public boolean hasCache() {
GemFireVM member = getGemFireVM();
if (member == null) {
return false;
@@ -230,7 +230,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
}
}
- public final SystemMemberCache getCache() throws org.apache.geode.admin.AdminException {
+ public SystemMemberCache getCache() throws org.apache.geode.admin.AdminException {
GemFireVM vm = getGemFireVM(); // fix for bug 33505
if (vm == null)
return null;
@@ -256,7 +256,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
* Sets the value of this system member's distribution-related configuration based on the given
* <code>Config</code> object.
*/
- public final void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
+ public void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
if (config == null) {
throw new AdminException(
LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
@@ -285,7 +285,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
}
}
- public final ConfigurationParameter[] getConfiguration() {
+ public ConfigurationParameter[] getConfiguration() {
ConfigurationParameter[] array = new ConfigurationParameter[this.parms.size()];
this.parms.values().toArray(array);
return array;
@@ -368,7 +368,7 @@ public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
/**
* Returns the <code>GemFireVM</code> that underlies this <code>SystemMember</code>.
*/
- protected final GemFireVM getGemFireVM() {
+ protected GemFireVM getGemFireVM() {
return this.vm;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
index c1f49c5..0411e0a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
* @deprecated as of 6.5 use {@link DiskStoreFactory} instead
*/
@Deprecated
-public final class DiskWriteAttributesFactory implements java.io.Serializable {
+public class DiskWriteAttributesFactory implements java.io.Serializable {
private static final long serialVersionUID = -4077746249663727235L;
private final Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 180d31b..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 final 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) {
@@ -392,11 +392,11 @@ public abstract class AbstractOp implements Op {
}
}
- protected final boolean hasFailed() {
+ protected boolean hasFailed() {
return this.failed;
}
- protected final boolean hasTimedOut() {
+ protected boolean hasTimedOut() {
return this.timedOut;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 3cf0d7b..3502757 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
@@ -52,7 +52,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
*
* @since GemFire 6.5
*/
-public final class ClientMetadataService {
+public class ClientMetadataService {
private static final Logger logger = LogService.getLogger();
@@ -539,7 +539,7 @@ public final class ClientMetadataService {
}
}
- public final void getClientPRMetadata(LocalRegion region) {
+ public 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/a4458531/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
index d91719d..ba647c8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionStats.java
@@ -3256,11 +3256,11 @@ public class ConnectionStats implements MessageStats {
this.sendStats.close();
}
- public final void incReceivedBytes(long v) {
+ public void incReceivedBytes(long v) {
this.stats.incLong(receivedBytesId, v);
}
- public final void incSentBytes(long v) {
+ public void incSentBytes(long v) {
this.stats.incLong(sentBytesId, v);
// if (this.gatewayStats != null) {
// this.gatewayStats.incSentBytes(v);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
index a436aed..882c7e6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
@@ -1310,7 +1310,7 @@ public class PoolImpl implements InternalPool {
public static abstract class PoolTask implements Runnable {
- public final void run() {
+ public void run() {
try {
run2();
} catch (VirtualMachineError e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
index 906a2b3..447ed38 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PutOp.java
@@ -361,7 +361,7 @@ public class PutOp {
* exception.
* @since GemFire 6.1
*/
- private final void processAck(Message msg, String opName, Connection con) throws Exception {
+ private void processAck(Message msg, String opName, Connection con) throws Exception {
final int msgType = msg.getMessageType();
// Update delta stats
if (this.deltaSent && this.region != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
index 7ada76f..2530472 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java
@@ -392,21 +392,21 @@ public class QueueStateImpl implements QueueState {
/**
* @return Returns the creationTime.
*/
- public final long getCreationTime() {
+ public long getCreationTime() {
return creationTime;
}
/**
* @return Returns the sequenceId.
*/
- public final long getSequenceId() {
+ public long getSequenceId() {
return sequenceId;
}
/**
* @return Returns the putAllSequenceId.
*/
- public final long getPutAllSequenceId() {
+ public long getPutAllSequenceId() {
return putAllSequenceId;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
index ef54791..a3884c4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/operations/internal/UpdateOnlyMap.java
@@ -130,7 +130,7 @@ public class UpdateOnlyMap implements Map, Serializable {
return entrySet;
}
- private final class EntrySet extends AbstractSet {
+ private class EntrySet extends AbstractSet {
public Iterator iterator() {
return new EntryIterator();
}
@@ -140,6 +140,7 @@ public class UpdateOnlyMap implements Map, Serializable {
return m.size();
}
}
+
private class EntryIterator implements Iterator {
private Iterator mIterator = m.entrySet().iterator();
@@ -209,7 +210,7 @@ public class UpdateOnlyMap implements Map, Serializable {
return values;
}
- private final class Values extends AbstractCollection {
+ private class Values extends AbstractCollection {
@Override
public Iterator iterator() {
return new ValueIterator();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
index 26da1a3..d0cf5db 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
@@ -340,7 +340,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
* Returns the entry associated with the specified key in the IntHashMap. Returns null if the
* IntHashMap contains no mapping for the key.
*/
- final Entry getEntry(Object key) {
+ Entry getEntry(Object key) {
int hash = (key == null) ? 0 : hash(hashingStrategy.hashCode(key));
for (Entry e = table[indexFor(hash, table.length)]; e != null; e = e.next) {
Object k;
@@ -530,7 +530,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
* Removes and returns the entry associated with the specified key in the IntHashMap. Returns null
* if the IntHashMap contains no mapping for this key.
*/
- final Entry removeEntryForKey(Object key) {
+ Entry removeEntryForKey(Object key) {
int hash = (key == null) ? 0 : hash(hashingStrategy.hashCode(key));
int i = indexFor(hash, table.length);
Entry prev = table[i];
@@ -560,7 +560,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
/**
* Special version of remove for EntrySet.
*/
- final Entry removeMapping(Object o) {
+ Entry removeMapping(Object o) {
if (!(o instanceof Entry))
return null;
@@ -850,11 +850,11 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
}
}
- public final boolean hasNext() {
+ public boolean hasNext() {
return next != null;
}
- final Entry nextEntry() {
+ Entry nextEntry() {
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
Entry e = next;
@@ -882,13 +882,13 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
}
- private final class KeyIterator extends HashIterator<Object> {
+ private class KeyIterator extends HashIterator<Object> {
public Object next() {
return nextEntry().getKey();
}
}
- private final class EntryIterator extends HashIterator<Entry> {
+ private class EntryIterator extends HashIterator<Entry> {
public Entry next() {
return nextEntry();
}
@@ -923,7 +923,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
return (ks != null ? ks : (keySet = new KeySet()));
}
- private final class KeySet extends AbstractSet<Object> {
+ private class KeySet extends AbstractSet<Object> {
public Iterator<Object> iterator() {
return newKeyIterator();
}
@@ -966,7 +966,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
return es != null ? es : (entrySet = new EntrySet());
}
- private final class EntrySet extends AbstractSet<Entry> {
+ private class EntrySet extends AbstractSet<Entry> {
public Iterator<Entry> iterator() {
return newEntryIterator();
}
@@ -1055,7 +1055,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
return loadFactor;
}
- private final class IntHashMapStrategy implements HashingStrategy {
+ private class IntHashMapStrategy implements HashingStrategy {
@Override
public int hashCode(Object o) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
index 5730f67..5bba736 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryObserverHolder.java
@@ -35,7 +35,7 @@ package org.apache.geode.cache.query.internal;
*
* @version $Revision: 1.1 $
*/
-public final class QueryObserverHolder {
+public class QueryObserverHolder {
/**
* The default 'do-nothing' query observer *
@@ -49,7 +49,7 @@ public final class QueryObserverHolder {
/**
* Set the given observer to be notified of query events. Returns the current observer.
*/
- public static final QueryObserver setInstance(QueryObserver observer) {
+ public static QueryObserver setInstance(QueryObserver observer) {
Support.assertArg(observer != null, "setInstance expects a non-null argument!");
QueryObserver oldObserver = _instance;
_instance = observer;
@@ -61,14 +61,14 @@ public final class QueryObserverHolder {
}
/** Return the current QueryObserver instance */
- public static final QueryObserver getInstance() {
+ public static QueryObserver getInstance() {
return _instance;
}
/**
* Only for test purposes.
*/
- public static final void reset() {
+ public static void reset() {
_instance = NO_OBSERVER;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
index 6fb7d8d..e4ea56c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapper.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.Version;
*
* @since GemFire 4.0
*/
-public final class ResultsCollectionWrapper implements SelectResults, DataSerializableFixedID {
+public class ResultsCollectionWrapper implements SelectResults, DataSerializableFixedID {
private Collection base;
private CollectionType collectionType;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
index 209cd10..1e7a2f9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ResultsSet.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 4.0
*/
-public final class ResultsSet extends HashSet implements SelectResults, DataSerializableFixedID {
+public class ResultsSet extends HashSet implements SelectResults, DataSerializableFixedID {
private static final long serialVersionUID = -5423281031630216824L;
private ObjectType elementType;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
index 05ebea7..db925b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedResultSet.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.Version;
*
* @since GemFire 4.0
*/
-public final class SortedResultSet extends TreeSet
+public class SortedResultSet extends TreeSet
implements SelectResults, Ordered, DataSerializableFixedID {
private static final long serialVersionUID = 5184711453750319224L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index d1f9fb7..f3fd661 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.Version;
*
* @since GemFire 4.0
*/
-public final class SortedStructSet extends TreeSet
+public class SortedStructSet extends TreeSet
implements SelectResults, DataSerializableFixedID, Ordered, StructFields {
private static final long serialVersionUID = -1687142950781718159L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
index a2c4b7f..5db6e28 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructBag.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 5.1
*/
-public final class StructBag extends ResultsBag implements StructFields {
+public class StructBag extends ResultsBag implements StructFields {
/**
* Holds value of property modifiable.
*/
@@ -52,12 +52,12 @@ public final class StructBag extends ResultsBag implements StructFields {
*/
protected static class ObjectArrayHashingStrategy implements HashingStrategy {
- public final int hashCode(Object o) {
+ public int hashCode(Object o) {
Object[] oa = (Object[]) o;
return Arrays.deepHashCode(oa);
}
- public final boolean equals(Object o1, Object o2) {
+ public boolean equals(Object o1, Object o2) {
if (o1 == null)
return o2 == null;
if (!(o1 instanceof Object[]) || !(o2 instanceof Object[])) {
@@ -73,7 +73,7 @@ public final class StructBag extends ResultsBag implements StructFields {
protected static class ObjectArrayFUHashingStrategy implements Hash.Strategy<Object> {
private static final long serialVersionUID = 8975047264555337042L;
- public final int hashCode(Object o) {
+ public int hashCode(Object o) {
// throws ClassCastException if not Object[]
// compute hash code based on all elements
if (!(o instanceof Object[])) {
@@ -90,7 +90,7 @@ public final class StructBag extends ResultsBag implements StructFields {
return h;
}
- public final boolean equals(Object o1, Object o2) {
+ public boolean equals(Object o1, Object o2) {
// throws ClassCastException if not Object[]
if (o1 == null)
return o2 == null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
index 984c419..bbc6979 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/StructSet.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 4.0
*/
-public final class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, SelectResults,
+public class StructSet /* extends ObjectOpenCustomHashSet */ implements Set, SelectResults,
DataSerializableFixedID, StructFields {
private static final long serialVersionUID = -1228835506930611510L;
@@ -64,7 +64,7 @@ public final class StructSet /* extends ObjectOpenCustomHashSet */ implements Se
protected static class ObjectArrayHashingStrategy implements ObjectOpenCustomHashSet.Strategy {
private static final long serialVersionUID = -6407549977968716071L;
- public final int hashCode(Object o) {
+ public int hashCode(Object o) {
// throws ClassCastException if not Object[]
// compute hash code based on all elements
Object[] oa = (Object[]) o;
@@ -77,7 +77,7 @@ public final class StructSet /* extends ObjectOpenCustomHashSet */ implements Se
return h;
}
- public final boolean equals(Object o1, Object o2) {
+ public boolean equals(Object o1, Object o2) {
// throws ClassCastException if not Object[]
if (o1 == null)
return o2 == null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
index 3ee0428..76a0325 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/Undefined.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.Version;
*
*/
-public final class Undefined implements DataSerializableFixedID, Comparable, Serializable {
+public class Undefined implements DataSerializableFixedID, Comparable, Serializable {
private static final long serialVersionUID = 6643107525908324141L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 6022b43..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
@@ -46,7 +46,7 @@ public class HashIndexSet implements Set {
* optional statistics object to track number of hash collisions and time spent probing based on
* hash collisions
*/
- final class HashIndexSetProperties {
+ class HashIndexSetProperties {
/** the set of Objects */
final protected transient Object[] set;
/** used for hashing into the table **/
@@ -484,7 +484,7 @@ public class HashIndexSet implements Set {
return false;
}
- public final boolean areObjectsEqual(Object o1, Object o2) {
+ public boolean areObjectsEqual(Object o1, Object o2) {
if (o1 == null) {
return o2 == null;
}
@@ -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 {
@@ -671,7 +671,7 @@ public class HashIndexSet implements Set {
/**
* Before inserting we can ensure we have capacity
*/
- protected final void preInsertHook() {
+ protected void preInsertHook() {
if (hashIndexSetProperties.size > hashIndexSetProperties.maxSize
|| hashIndexSetProperties.free == 0 || TEST_ALWAYS_REHASH) {
rehash(arraySize(hashIndexSetProperties.size + 1, _loadFactor));
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 889c4ec..1f66f0d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -25,7 +25,7 @@ import org.apache.geode.DataSerializer;
*
* @since GemFire 4.0
*/
-public final class MapTypeImpl extends CollectionTypeImpl implements MapType {
+public class MapTypeImpl extends CollectionTypeImpl implements MapType {
private static final long serialVersionUID = -705688605389537058L;
private ObjectType keyType;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index 7047e12..cef2009 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 4.0
*/
-public final class StructTypeImpl extends ObjectTypeImpl implements StructType {
+public class StructTypeImpl extends ObjectTypeImpl implements StructType {
private static final long serialVersionUID = -6368710865627039204L;
private String[] fieldNames;
private ObjectType[] fieldTypes;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
index 3939fe7..5d936b9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
@@ -27,7 +27,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
* used to track the events received by <code>AsyncEventListener</code>. If the event has already
* been seen, <code>AsyncEventListener</code> can choose to ignore it.
*/
-public final class EventSequenceID {
+public class EventSequenceID {
/**
* Uniquely identifies the distributed member VM in which the Event is produced
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
index 05d75e8..6324823 100644
--- a/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
+++ b/geode-core/src/main/java/org/apache/geode/compression/SnappyCompressor.java
@@ -26,7 +26,7 @@ import org.iq80.snappy.Snappy;
*
* @since GemFire 8.0
*/
-public final class SnappyCompressor implements Compressor, Serializable {
+public class SnappyCompressor implements Compressor, Serializable {
private static final long serialVersionUID = 496609875302446099L;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
index 856a2cd..641e009 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/LocatorLauncher.java
@@ -63,7 +63,7 @@ import java.util.logging.Level;
* @since GemFire 7.0
*/
@SuppressWarnings({"unused"})
-public final class LocatorLauncher extends AbstractLauncher<String> {
+public class LocatorLauncher extends AbstractLauncher<String> {
/**
* @deprecated This is specific to the internal implementation and may go away in a future
@@ -1962,7 +1962,7 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
*
* @see org.apache.geode.distributed.AbstractLauncher.ServiceState
*/
- public static final class LocatorState extends ServiceState<String> {
+ public static class LocatorState extends ServiceState<String> {
/**
* Unmarshals a LocatorState instance from the JSON String.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
index 459123f..b2d0151 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
@@ -2603,7 +2603,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
*
* @see org.apache.geode.distributed.AbstractLauncher.ServiceState
*/
- public static final class ServerState extends ServiceState<String> {
+ public static class ServerState extends ServiceState<String> {
/**
* Unmarshals a ServerState instance from the JSON String.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
index 2c6c025..01c6157 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/AbstractDistributionConfig.java
@@ -1241,7 +1241,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
return dcAttDescriptions;
}
- public static final InetAddress _getDefaultMcastAddress() {
+ public static InetAddress _getDefaultMcastAddress() {
// Default MCast address can be just IPv4 address.
// On IPv6 machines, JGroups converts IPv4 address to equivalent IPv6 address.
String ipLiteral = "239.192.81.1";
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 1d3dc86..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
@@ -372,7 +372,7 @@ public class DistributionAdvisor {
return getAdvisee().getDistributionManager();
}
- public final DistributionAdvisee getAdvisee() {
+ public DistributionAdvisee getAdvisee() {
return this.advisee;
}
@@ -458,7 +458,7 @@ public class DistributionAdvisor {
}
// wait for pending profile exchange to complete before returning
- public final boolean isInitialized() {
+ public boolean isInitialized() {
synchronized (this.initializeLock) {
return this.initialized;
}
@@ -470,7 +470,7 @@ public class DistributionAdvisor {
*
* @since GemFire 5.7
*/
- public final boolean pollIsInitialized() {
+ public boolean pollIsInitialized() {
return this.initialized;
}
@@ -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,
@@ -755,7 +755,7 @@ public class DistributionAdvisor {
* @param version The membership version returned by startOperation
* @since GemFire 5.1
*/
- public final synchronized long endOperation(long version) {
+ public synchronized long endOperation(long version) {
synchronized (this.opCountLock) {
if (version == membershipVersion) {
currentVersionOpCount--;
@@ -1182,7 +1182,7 @@ public class DistributionAdvisor {
* @since GemFire 5.7
*/
@SuppressWarnings("unchecked")
- protected final Set<InternalDistributedMember> getDefaultDistributionMembers() {
+ protected Set<InternalDistributedMember> getDefaultDistributionMembers() {
if (!useAdminMembersForDefault()) {
return getDistributionManager().getOtherDistributionManagerIds();
} else {
@@ -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 final 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/a4458531/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
index 07e8b02..e878cce 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigSnapshot.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* Removed implementations of hashCode() and equals() that were throwing
* UnsupportedOperationException. See bug #50939 if you need to override those.
*/
-public final class DistributionConfigSnapshot extends DistributionConfigImpl {
+public class DistributionConfigSnapshot extends DistributionConfigImpl {
private static final long serialVersionUID = 7445728132965092798L;
private HashSet modifiable;
[38/69] [abbrv] geode git commit: GEODE-2836: CacheCallback now
extends Declarable
Posted by ud...@apache.org.
GEODE-2836: CacheCallback now extends Declarable
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a2ddc618
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a2ddc618
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a2ddc618
Branch: refs/heads/feature/GEODE-2580
Commit: a2ddc61845cf8f47da82dd3c19f5b5a099ddd085
Parents: 3034ef6
Author: Jared Stewart <js...@pivotal.io>
Authored: Thu May 11 14:43:48 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Tue May 16 16:13:27 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/cache/CacheCallback.java | 2 +-
.../java/org/apache/geode/cache/Declarable.java | 4 ++--
.../apache/geode/cache30/CacheXml66DUnitTest.java | 17 +++--------------
.../apache/geode/cache30/ReconnectDUnitTest.java | 4 ++++
4 files changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a2ddc618/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
index a272afb..fdcdb26 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
@@ -21,7 +21,7 @@ package org.apache.geode.cache;
*
* @since GemFire 3.0
*/
-public interface CacheCallback {
+public interface CacheCallback extends Declarable {
/**
* Called when the region containing this callback is closed or destroyed, when the cache is
* closed, or when a callback is removed from a region using an <code>AttributesMutator</code>.
http://git-wip-us.apache.org/repos/asf/geode/blob/a2ddc618/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
index 57e1e63..2b54461 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
@@ -50,7 +50,7 @@ import java.util.Properties;
* See <a href="package-summary.html#declarative">package introduction</a>.
*
*
- *
+ *
* @since GemFire 2.0
*/
public interface Declarable {
@@ -64,5 +64,5 @@ public interface Declarable {
* @throws IllegalArgumentException If one of the configuration options in <code>props</code> is
* illegal or malformed.
*/
- public void init(Properties props);
+ public default void init(Properties props) {};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a2ddc618/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index 1c772a2..38d345f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -4171,21 +4171,10 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
* Tests parsing an XML file that specifies a cache listener that is not {@link Declarable}.
*/
@Test
- public void testCallbackNotDeclarable() throws Exception {
+ public void testCallbackNotExplicitlyDeclarableIsStillOK() {
setXmlFile(findFile("callbackNotDeclarable.xml"));
- IgnoredException expectedException =
- IgnoredException.addIgnoredException("While reading Cache XML file");
- try {
- getCache();
- fail("Should have thrown a CacheXmlException");
-
- } catch (CacheXmlException ex) {
- Throwable cause = ex.getCause();
- assertNull(cause);
- } finally {
- expectedException.remove();
- }
+ getCache();
}
/**
@@ -4483,7 +4472,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
/**
* A cache listener that is not {@link Declarable}
*
- * @see #testCallbackNotDeclarable()
+ * @see #testCallbackNotExplicitlyDeclarableIsStillOK()
*/
public static class NotDeclarableCacheListener extends TestCacheListener {
// empty
http://git-wip-us.apache.org/repos/asf/geode/blob/a2ddc618/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index b3f39ee..8b30f02 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -1282,6 +1282,10 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
* auto-reconnect to fail.
*/
public static class NonDeclarableListener extends CacheListenerAdapter {
+ @Override
+ public void init(Properties props) {
+ throw new RuntimeException("Simulate non-declarable listener");
+ };
}
/**
[67/69] [abbrv] geode git commit: GEODE-2582: New client can send a
Put request with Protobuf IDL.
Posted by ud...@apache.org.
GEODE-2582: New client can send a Put request with Protobuf IDL.
* Update the proto IDL
* Get a put request working.
Currently this only uses String serialization; serialization protocols
still have to be implemented.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/511e2a35
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/511e2a35
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/511e2a35
Branch: refs/heads/feature/GEODE-2580
Commit: 511e2a351d4be68b7741727abc34d5147584dff7
Parents: 64798a5
Author: Galen OSullivan <go...@pivotal.io>
Authored: Thu Mar 16 16:26:03 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon May 22 11:27:03 2017 -0700
----------------------------------------------------------------------
geode-assembly/build.gradle | 9 +-
geode-client-protobuf/build.gradle | 88 ++++++++++
.../client/NewClientProtocolTestClient.java | 103 +++++++++++
.../client/ProtobufProtocolMessageHandler.java | 175 +++++++++++++++++++
.../src/main/proto/basicTypes.proto | 45 +++++
.../src/main/proto/clientProtocol.proto | 64 +++++++
.../src/main/proto/region_API.proto | 63 +++++++
...he.tier.sockets.ClientProtocolMessageHandler | 1 +
.../geode/protocol/client/MessageUtils.java | 92 ++++++++++
.../client/ProtobufProtocolIntegrationTest.java | 85 +++++++++
...rotobufSerializationDeserializationTest.java | 101 +++++++++++
.../client/internal/ConnectionFactoryImpl.java | 3 +-
.../cache/client/internal/ConnectionImpl.java | 17 +-
.../geode/internal/cache/tier/Acceptor.java | 5 +
.../cache/tier/sockets/AcceptorImpl.java | 7 +-
.../sockets/ClientProtocolMessageHandler.java | 28 +++
.../internal/cache/tier/sockets/HandShake.java | 21 +++
.../cache/tier/sockets/ServerConnection.java | 85 +++++++--
.../geode/serialization/Deserializer.java | 20 +++
.../serialization/FunctionalSerializer.java | 36 ++++
.../geode/serialization/SerializationType.java | 36 ++++
.../apache/geode/serialization/Serializer.java | 20 +++
.../geode/pdx/PdxClientServerDUnitTest.java | 5 +-
gradle/rat.gradle | 6 +-
settings.gradle | 1 +
25 files changed, 1094 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index a4f0c69..6c626a0 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -61,6 +61,7 @@ dependencies {
archives project(':geode-wan')
archives project(':geode-cq')
archives project(':geode-rebalancer')
+ archives project(':geode-client-protobuf')
testCompile project(':geode-junit')
testCompile project(':geode-pulse')
@@ -176,7 +177,10 @@ def cp = {
it.contains('lucene-analyzers-common') ||
it.contains('lucene-core') ||
it.contains('lucene-queries') ||
- it.contains('lucene-queryparser')
+ it.contains('lucene-queryparser') ||
+
+ // dependencies from geode-client-protobuf
+ it.contains('protobuf-java')
}
}
}.flatten().unique().join(' ')
@@ -335,6 +339,9 @@ distributions {
from project(":geode-lucene").configurations.runtime
from project(":geode-lucene").configurations.archives.allArtifacts.files
+
+ from project(":geode-client-protobuf").configurations.runtime
+ from project(":geode-client-protobuf").configurations.archives.allArtifacts.files
from project(":geode-old-client-support").configurations.runtime
from project(":geode-old-client-support").configurations.archives.allArtifacts.files
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/build.gradle
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/build.gradle b/geode-client-protobuf/build.gradle
new file mode 100644
index 0000000..c82f311
--- /dev/null
+++ b/geode-client-protobuf/build.gradle
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+apply plugin: 'java'
+apply plugin: 'com.google.protobuf'
+apply plugin: 'idea'
+
+repositories {
+ maven { url "https://plugins.gradle.org/m2/" }
+}
+
+buildscript {
+ repositories {
+ maven { url "https://plugins.gradle.org/m2/" }
+ }
+ dependencies {
+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.1'
+ }
+}
+
+dependencies {
+ compile 'com.google.protobuf:protobuf-java:3.0.0'
+ //compile 'io.grpc:grpc-stub:1.0.0-pre2'
+ //compile 'io.grpc:grpc-protobuf:1.0.0-pre2'
+ // Extra proto source files besides the ones residing under
+ // "src/main".
+ protobuf files("main/proto/")
+ protobuf fileTree("ext/")
+
+ provided project(':geode-core')
+
+ testCompile 'junit:junit:4.12'
+ testCompile project (':geode-junit')
+ testCompile "org.mockito:mockito-core:2.+"
+ testCompile files(project(':geode-core').sourceSets.test.output)
+ // Extra proto source files for test besides the ones residing under
+ // "src/test".
+ //testProtobuf files("lib/protos-test.tar.gz")
+}
+
+protobuf {
+ protoc {
+ // The artifact spec for the Protobuf Compiler
+ artifact = 'com.google.protobuf:protoc:3.0.0'
+ }
+ // this allows our spotless rule to skip this directory (hopefully rat too)
+ generatedFilesBaseDir = "$buildDir/generated-src/proto"
+
+// plugins {
+// // Optional: an artifact spec for a protoc plugin, with "grpc" as
+// // the identifier, which can be referred to in the "plugins"
+// // container of the "generateProtoTasks" closure.
+// grpc {
+// artifact = 'io.grpc:protoc-gen-grpc-java:1.0.0-pre2'
+// }
+// }
+// generateProtoTasks {
+// ofSourceSet('main')*.plugins {
+// // Apply the "grpc" plugin whose spec is defined above, without
+// // options. Note the braces cannot be omitted, otherwise the
+// // plugin will not be added. This is because of the implicit way
+// // NamedDomainObjectContainer binds the methods.
+// grpc { }
+// }
+// }
+}
+
+// let IntelliJ know where the generated sources are.
+idea {
+ module {
+ sourceDirs += file("${protobuf.generatedFilesBaseDir}/main/java")
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
new file mode 100644
index 0000000..a4476e1
--- /dev/null
+++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.protocol.client;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
+import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.protocol.protobuf.ClientProtocol.Message;
+import org.apache.geode.protocol.protobuf.RegionAPI;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.util.Random;
+
+
+public class NewClientProtocolTestClient implements AutoCloseable {
+ private static SocketChannel socketChannel;
+ private final OutputStream outputStream;
+ private final InputStream inputStream;
+
+ public NewClientProtocolTestClient(String hostname, int port) throws IOException {
+ socketChannel = SocketChannel.open(new InetSocketAddress(hostname, port));
+ inputStream = socketChannel.socket().getInputStream();
+ outputStream = socketChannel.socket().getOutputStream();
+ }
+
+ @Override
+ public void close() throws IOException {
+ socketChannel.close();
+ }
+
+ private static void sendHeader(OutputStream outputStream) throws IOException {
+ outputStream.write(AcceptorImpl.CLIENT_TO_SERVER_NEW_PROTOCOL);
+ }
+
+ public Message blockingSendMessage(Message message) throws IOException {
+ sendHeader(outputStream);
+
+ message.writeDelimitedTo(outputStream);
+ outputStream.flush();
+
+ return ClientProtocol.Message.parseDelimitedFrom(inputStream);
+ }
+
+ void parseResponse(Message response) {
+ System.out.println("response = " + response.toString());
+ }
+
+ private Message generateMessage() {
+ Random random = new Random();
+ ClientProtocol.MessageHeader.Builder messageHeader =
+ ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
+ // .setSize() //we don't need to set the size because Protobuf will handle the message frame
+
+ BasicTypes.Key.Builder key =
+ BasicTypes.Key.newBuilder().setKey(ByteString.copyFrom(createByteArrayOfSize(64)));
+
+ BasicTypes.Value.Builder value =
+ BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(createByteArrayOfSize(512)));
+
+ RegionAPI.PutRequest.Builder putRequestBuilder =
+ RegionAPI.PutRequest.newBuilder().setRegionName("TestRegion")
+ .setEntry(BasicTypes.Entry.newBuilder().setKey(key).setValue(value));
+
+ ClientProtocol.Request.Builder request =
+ ClientProtocol.Request.newBuilder().setPutRequest(putRequestBuilder);
+
+ Message.Builder message =
+ Message.newBuilder().setMessageHeader(messageHeader).setRequest(request);
+
+ return message.build();
+ }
+
+ private static byte[] createByteArrayOfSize(int msgSize) {
+ byte[] array = new byte[msgSize];
+ for (int i = 0; i < msgSize; i++) {
+ array[i] = 'a';
+ }
+ return array;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
new file mode 100644
index 0000000..a6993c4
--- /dev/null
+++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.protocol.client;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Parser;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.protocol.protobuf.RegionAPI.GetRequest;
+import org.apache.geode.protocol.protobuf.RegionAPI.GetResponse;
+import org.apache.geode.protocol.protobuf.RegionAPI.PutResponse;
+import org.apache.geode.serialization.Deserializer;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Message;
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Request;
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Response;
+import static org.apache.geode.protocol.protobuf.RegionAPI.PutRequest;
+
+public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHandler {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private String ErrorMessageFromMessage(Message message) {
+ return "Error parsing message, message string: " + message.toString();
+ }
+
+ @Override
+ public void receiveMessage(InputStream inputStream, OutputStream outputStream,
+ Deserializer deserializer, Cache cache) throws IOException {
+ final Message message = Message.parseDelimitedFrom(inputStream);
+ // can be null at EOF, see Parser.parseDelimitedFrom(java.io.InputStream)
+ if (message == null) {
+ return;
+ }
+
+ if (message.getMessageTypeCase() != Message.MessageTypeCase.REQUEST) {
+ // TODO
+ logger.error(() -> "Got message of type response: " + ErrorMessageFromMessage(message));
+ }
+
+ Request request = message.getRequest();
+ Message putResponseMessage = doPutRequest(request.getPutRequest(), deserializer, cache);
+
+ putResponseMessage.writeDelimitedTo(outputStream);
+ }
+
+ private Message doPutRequest(PutRequest request, Deserializer dataDeserializer, Cache cache) {
+ logger.error("Doing put request.");
+ final String regionName = request.getRegionName();
+ final BasicTypes.Entry entry = request.getEntry();
+ final ByteString key = entry.getKey().getKey();
+ final ByteString value = entry.getValue().getValue();
+
+ final Region<Object, Object> region = cache.getRegion(regionName);
+ try {
+ region.put(dataDeserializer.deserialize(key.toByteArray()),
+ dataDeserializer.deserialize(value.toByteArray()));
+ return putResponseWithStatus(true);
+ } catch (TimeoutException | CacheWriterException ex) {
+ logger.error("Caught normal-ish exception doing region put", ex);
+ return putResponseWithStatus(false);
+ }
+ }
+
+ private Message putResponseWithStatus(boolean ok) {
+ return Message.newBuilder()
+ .setResponse(Response.newBuilder().setPutResponse(PutResponse.newBuilder().setSuccess(ok)))
+ .build();
+ }
+
+ private GetResponse doGetRequest(GetRequest request, Deserializer deserializer, Cache cache) {
+ // TODO
+ return null;
+ }
+
+ public ProtobufProtocolMessageHandler() {}
+}
+
+
+// public final class NewClientProtocol {
+// public static void recvMessage(Cache cache, InputStream inputStream, OutputStream outputStream) {
+// try {
+// final DataInputStream dataInputStream = new DataInputStream(inputStream);
+// final DataOutputStream dataOutputStream = new DataOutputStream(outputStream);
+//
+// RequestHeader header = new RequestHeader(dataInputStream);
+//
+// // todo: string -- assume UTF-8 from here.
+// // Java modified UTF-8: unsigned short len. hope we don't run into the "modified" part.
+// switch (header.requestType) {
+// case MessageType.PUT:
+// servePutRequest(header, cache, dataInputStream, dataOutputStream);
+// break;
+// case MessageType.REQUEST: // this is a GET request.
+// serveGetRequest(cache, dataInputStream, dataOutputStream);
+// break;
+// }
+// } catch (IOException e) {
+// e.printStackTrace();
+// // todo error handling.
+// }
+// }
+//
+// private static void serveGetRequest(Cache cache, DataInputStream dataInputStream,
+// DataOutputStream dataOutputStream) throws IOException {
+// // GetRequest: Header RegionName Key CallbackArg
+// final String regionName = readString(dataInputStream);
+// final String key = readString(dataInputStream);
+// // todo no callback arg for now
+// final Region<Object, Object> region = cache.getRegion(regionName);
+// // todo anything more complex?
+//
+// Object val = region.get(key);
+// if (val == null) {
+// byte[] bytes = "Entry not found in region.".getBytes();
+// dataOutputStream.writeInt(bytes.length); // len
+// dataOutputStream.writeByte(19); // ENTRY_NOT_FOUND_EXCEPTION
+// dataOutputStream.write(bytes);
+// } else {
+// byte[] bytes = val.toString().getBytes();
+// dataOutputStream.writeInt(bytes.length); // len
+// dataOutputStream.writeByte(1); // RESPONSE
+// dataOutputStream.write(bytes);
+// }
+// dataOutputStream.flush();
+// }
+//
+// // response: size responseType requestId
+//
+// private static void servePutRequest(RequestHeader header, Cache cache,
+// DataInputStream dataInputStream, DataOutputStream dataOutputStream) throws IOException {
+// String regionName = readString(dataInputStream);
+// // assume every object is a string.
+//
+// String key = readString(dataInputStream);
+// // TODO: value header, callback arg?
+// String value = readString(dataInputStream);
+//
+// Region<Object, Object> region = cache.getRegion(regionName);
+// region.put(key, value);
+//
+// dataOutputStream.writeInt(0); // len
+// dataOutputStream.writeByte(1); // RESPONSE
+// dataOutputStream.writeInt(header.requestId);
+// dataOutputStream.flush();
+// }
+//
+// private static String readString(DataInputStream inputStream) throws IOException {
+// String s = inputStream.readUTF();
+// return s;
+// }
+// }
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/proto/basicTypes.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/basicTypes.proto b/geode-client-protobuf/src/main/proto/basicTypes.proto
new file mode 100644
index 0000000..7cb4204
--- /dev/null
+++ b/geode-client-protobuf/src/main/proto/basicTypes.proto
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+syntax = "proto3";
+package org.apache.geode.protocol.protobuf;
+
+import "google/protobuf/any.proto";
+
+message Entry{
+ Key key = 1;
+ Value value = 2;
+}
+
+message Key {
+ bytes key = 1;
+}
+
+message Value {
+ ValueHeader valueHeader = 1;
+ bytes value = 2;
+}
+
+message ValueHeader {
+ int32 size = 1;
+ bool isPartial = 2;
+}
+
+message CallbackArguments{
+ oneof callbackArgs {
+ bool hasCallbackArgument = 1;
+ bytes callbackBytes = 2;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/proto/clientProtocol.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/clientProtocol.proto b/geode-client-protobuf/src/main/proto/clientProtocol.proto
new file mode 100644
index 0000000..7e1e7bb
--- /dev/null
+++ b/geode-client-protobuf/src/main/proto/clientProtocol.proto
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+syntax = "proto3";
+package org.apache.geode.protocol.protobuf;
+
+import "google/protobuf/any.proto";
+import "region_API.proto";
+
+message Message {
+ MessageHeader messageHeader = 1;
+ oneof messageType {
+ Request request = 2;
+ Response response = 3;
+ }
+}
+
+message MessageHeader {
+ int32 correlationId = 2;
+ MetaData metadata = 1;
+}
+
+message Request {
+ oneof requestAPI {
+ PutRequest putRequest = 1;
+ GetRequest getRequest = 2;
+ PutAllRequest putAllRequest = 3;
+ GetAllRequest getAllRequest = 4;
+ }
+}
+
+message Response {
+ ResponseHeader responseHeader = 1;
+ oneof responseAPI {
+ PutResponse putResponse = 2;
+ GetResponse getResponse = 3;
+ PutAllResponse putAllResponse = 4;
+ GetAllResponse getAllResponse = 5;
+ }
+}
+
+message ResponseHeader {
+ oneof reponseType {
+ int32 responseTypeID = 1;
+ int32 errorCode = 2;
+ }
+}
+
+message MetaData {
+ int32 numberOfMetadata = 1;
+ map<int32, google.protobuf.Any> metaDataEntries = 2;
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/proto/region_API.proto
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/proto/region_API.proto b/geode-client-protobuf/src/main/proto/region_API.proto
new file mode 100644
index 0000000..d46e0e6
--- /dev/null
+++ b/geode-client-protobuf/src/main/proto/region_API.proto
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+syntax = "proto3";
+package org.apache.geode.protocol.protobuf;
+
+import "basicTypes.proto";
+
+message PutRequest {
+ string regionName = 1;
+ Entry entry = 2;
+ CallbackArguments callbackArg = 3;
+}
+
+message PutResponse {
+ bool success = 1;
+}
+
+message GetRequest {
+ string regionName = 1;
+ Key key = 2;
+ CallbackArguments callbackArg = 3;
+}
+
+message GetResponse {
+ Value result = 1;
+}
+
+message PutAllRequest {
+ string regionName = 1;
+ int32 numberOfEntries = 2;
+ repeated Entry entry = 3;
+ CallbackArguments callbackArg = 4;
+}
+
+message PutAllResponse {
+ int32 numberOfKeysFailed = 1;
+ repeated Key key = 2;
+}
+
+message GetAllRequest {
+ string regionName = 1;
+ int32 numberOfKeys = 2;
+ repeated Key key = 3;
+ CallbackArguments callbackArg = 4;
+}
+
+message GetAllResponse {
+ int32 numberOfEntries = 1;
+ repeated Entry entries = 2;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler b/geode-client-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler
new file mode 100644
index 0000000..2afaf73
--- /dev/null
+++ b/geode-client-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler
@@ -0,0 +1 @@
+org.apache.geode.protocol.client.ProtobufProtocolMessageHandler
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
new file mode 100644
index 0000000..02e2a58
--- /dev/null
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.protocol.client;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.protocol.protobuf.RegionAPI;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+public class MessageUtils {
+ public static ByteArrayInputStream loadMessageIntoInputStream(ClientProtocol.Message message)
+ throws IOException {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ message.writeDelimitedTo(byteArrayOutputStream);
+ byte[] messageByteArray = byteArrayOutputStream.toByteArray();
+ return new ByteArrayInputStream(messageByteArray);
+ }
+
+ public static ClientProtocol.Message makePutMessage() {
+ Random random = new Random();
+ ClientProtocol.MessageHeader.Builder messageHeader =
+ ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
+
+ BasicTypes.Key.Builder key =
+ BasicTypes.Key.newBuilder().setKey(ByteString.copyFrom(createByteArrayOfSize(64)));
+
+ BasicTypes.Value.Builder value =
+ BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(createByteArrayOfSize(512)));
+
+ RegionAPI.PutRequest.Builder putRequestBuilder =
+ RegionAPI.PutRequest.newBuilder().setRegionName("TestRegion")
+ .setEntry(BasicTypes.Entry.newBuilder().setKey(key).setValue(value));
+
+ ClientProtocol.Request.Builder request =
+ ClientProtocol.Request.newBuilder().setPutRequest(putRequestBuilder);
+
+ ClientProtocol.Message.Builder message =
+ ClientProtocol.Message.newBuilder().setMessageHeader(messageHeader).setRequest(request);
+
+ return message.build();
+ }
+
+ public static ClientProtocol.Message makePutMessageFor(String region, String key, String value) {
+ Random random = new Random();
+ ClientProtocol.MessageHeader.Builder messageHeader =
+ ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
+
+ BasicTypes.Key.Builder keyBuilder =
+ BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key));
+
+ BasicTypes.Value.Builder valueBuilder =
+ BasicTypes.Value.newBuilder().setValue(ByteString.copyFromUtf8(value));
+
+ RegionAPI.PutRequest.Builder putRequestBuilder =
+ RegionAPI.PutRequest.newBuilder().setRegionName(region)
+ .setEntry(BasicTypes.Entry.newBuilder().setKey(keyBuilder).setValue(valueBuilder));
+
+ ClientProtocol.Request.Builder request =
+ ClientProtocol.Request.newBuilder().setPutRequest(putRequestBuilder);
+ ClientProtocol.Message.Builder message =
+ ClientProtocol.Message.newBuilder().setMessageHeader(messageHeader).setRequest(request);
+
+ return message.build();
+ }
+
+ private static byte[] createByteArrayOfSize(int msgSize) {
+ byte[] array = new byte[msgSize];
+ for (int i = 0; i < msgSize; i++) {
+ array[i] = 'a';
+ }
+ return array;
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
new file mode 100644
index 0000000..5d92cf0
--- /dev/null
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.protocol.client;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.Assert.*;
+
+@Category(IntegrationTest.class)
+public class ProtobufProtocolIntegrationTest {
+ @Test
+ public void testRoundTripClientCommunicationWorks() throws IOException {
+ try (Cache cache = createCacheOnPort(40404);
+ NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
+ final String testRegion = "testRegion";
+ final String testKey = "testKey";
+ final String testValue = "testValue";
+ Region<Object, Object> region = cache.createRegionFactory().create("testRegion");
+
+ ClientProtocol.Message message =
+ MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
+ ClientProtocol.Message response = client.blockingSendMessage(message);
+ client.parseResponse(response);
+
+ assertEquals(response.getMessageTypeCase(), ClientProtocol.Message.MessageTypeCase.RESPONSE);
+ assertEquals(response.getResponse().getResponseAPICase(),
+ ClientProtocol.Response.ResponseAPICase.PUTRESPONSE);
+ assertTrue(response.getResponse().getPutResponse().getSuccess());
+
+ assertEquals(1, region.size());
+ assertTrue(region.containsKey(testKey));
+ assertEquals(testValue, region.get(testKey));
+ }
+ }
+
+ @Test
+ public void startCache() throws IOException {
+ try (Cache cache = createCacheOnPort(40404)) {
+ while (true) {
+ try {
+ Thread.sleep(100000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private Cache createCacheOnPort(int port) throws IOException {
+ Properties props = new Properties();
+ props.setProperty(ConfigurationProperties.TCP_PORT, Integer.toString(port));
+ props.setProperty(ConfigurationProperties.BIND_ADDRESS, "localhost");
+ CacheFactory cf = new CacheFactory(props);
+ Cache cache = cf.create();
+ CacheServer cacheServer = cache.addCacheServer();
+ cacheServer.setBindAddress("localhost");
+ cacheServer.start();
+ return cache;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
new file mode 100644
index 0000000..8cf36ca
--- /dev/null
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.protocol.client;
+
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.serialization.Deserializer;
+import org.apache.geode.serialization.SerializationType;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
+import static org.apache.geode.protocol.client.MessageUtils.makePutMessage;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+@Category(UnitTest.class)
+public class ProtobufSerializationDeserializationTest {
+ @Test
+ public void protobufSerializationSmokeTest() throws InvalidProtocolBufferException {
+ ClientProtocol.Message message = makePutMessage();
+ byte[] bytes = message.toByteArray();
+ ClientProtocol.Message message1 = ClientProtocol.Message.parseFrom(bytes);
+ assertEquals(message, message1);
+ }
+
+ /**
+ * Given a serialized message that we've built, verify that the server part does the right call to
+ * the Cache it gets passed.
+ */
+ @Test
+ public void testNewClientProtocolPutsOnPutMessage() throws IOException {
+ final String testRegion = "testRegion";
+ final String testKey = "testKey";
+ final String testValue = "testValue";
+ ClientProtocol.Message message = MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
+
+ Deserializer deserializer = SerializationType.BYTE_BLOB.deserializer;
+ Cache mockCache = Mockito.mock(Cache.class);
+ Region mockRegion = Mockito.mock(Region.class);
+ when(mockCache.getRegion("testRegion")).thenReturn(mockRegion);
+ OutputStream mockOutputStream = Mockito.mock(OutputStream.class);
+
+ ProtobufProtocolMessageHandler newClientProtocol = new ProtobufProtocolMessageHandler();
+ newClientProtocol.receiveMessage(MessageUtils.loadMessageIntoInputStream(message),
+ mockOutputStream, deserializer, mockCache);
+
+ verify(mockRegion).put(testKey.getBytes(), testValue.getBytes());
+ }
+
+ @Test
+ public void testServerRespondsToPutMessage() throws IOException {
+ final String testRegion = "testRegion";
+ final String testKey = "testKey";
+ final String testValue = "testValue";
+ ClientProtocol.Message message = MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
+
+ Deserializer deserializer = SerializationType.BYTE_BLOB.deserializer;
+ Cache mockCache = Mockito.mock(Cache.class);
+ Region mockRegion = Mockito.mock(Region.class);
+ when(mockCache.getRegion("testRegion")).thenReturn(mockRegion);
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(128);
+
+ ProtobufProtocolMessageHandler newClientProtocol = new ProtobufProtocolMessageHandler();
+ newClientProtocol.receiveMessage(MessageUtils.loadMessageIntoInputStream(message), outputStream,
+ deserializer, mockCache);
+
+ ClientProtocol.Message responseMessage = ClientProtocol.Message
+ .parseDelimitedFrom(new ByteArrayInputStream(outputStream.toByteArray()));
+
+ assertEquals(responseMessage.getMessageTypeCase(),
+ ClientProtocol.Message.MessageTypeCase.RESPONSE);
+ assertEquals(responseMessage.getResponse().getResponseAPICase(),
+ ClientProtocol.Response.ResponseAPICase.PUTRESPONSE);
+ assertTrue(responseMessage.getResponse().getPutResponse().getSuccess());
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
index a419d57..fc9eab1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionFactoryImpl.java
@@ -116,7 +116,8 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
} else if (forQueue) {
return Acceptor.CLIENT_TO_SERVER_FOR_QUEUE;
} else {
- return Acceptor.CLIENT_TO_SERVER;
+ // return Acceptor.CLIENT_TO_SERVER;
+ return Acceptor.CLIENT_TO_SERVER_NEW_PROTOCOL;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
index f71b79b..35bbcef 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionImpl.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache.client.internal;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketException;
import java.nio.ByteBuffer;
@@ -31,16 +32,19 @@ import org.apache.geode.cache.client.internal.ExecuteFunctionOp.ExecuteFunctionO
import org.apache.geode.cache.client.internal.ExecuteRegionFunctionOp.ExecuteRegionFunctionOpImpl;
import org.apache.geode.cache.client.internal.ExecuteRegionFunctionSingleHopOp.ExecuteRegionFunctionSingleHopOpImpl;
import org.apache.geode.cache.wan.GatewaySender;
+import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.internal.net.SocketCreator;
/**
* A single client to server connection.
@@ -114,7 +118,16 @@ public class ConnectionImpl implements Connection {
theSocket.setSoTimeout(handShakeTimeout);
out = theSocket.getOutputStream();
in = theSocket.getInputStream();
- this.status = handShake.handshakeWithServer(this, location, communicationMode);
+
+ if (communicationMode == AcceptorImpl.CLIENT_TO_SERVER_NEW_PROTOCOL) {
+ handShake.writeNewProtcolVersionForServer(this, communicationMode);
+ InetSocketAddress remoteAddr = (InetSocketAddress) theSocket.getRemoteSocketAddress();
+ DistributedMember distributedMember =
+ new InternalDistributedMember(remoteAddr.getAddress(), remoteAddr.getPort());
+ this.status = new ServerQueueStatus(distributedMember);
+ } else {
+ this.status = handShake.handshakeWithServer(this, location, communicationMode);
+ }
commBuffer = ServerConnection.allocateCommBuffer(socketBufferSize, theSocket);
if (sender != null) {
commBufferForAsyncRead = ServerConnection.allocateCommBuffer(socketBufferSize, theSocket);
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
index 9a3241b..26df0e2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/Acceptor.java
@@ -71,6 +71,11 @@ public abstract class Acceptor {
*/
public static final byte CLIENT_TO_SERVER_FOR_QUEUE = (byte) 107;
+ /**
+ * For new client-server protocol which ignores current handshake mechanism
+ */
+ public static final byte CLIENT_TO_SERVER_NEW_PROTOCOL = (byte) 110;
+
/**
* The GFE version of the server.
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
index 9658f98..33596ff 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
@@ -1424,8 +1424,8 @@ public class AcceptorImpl extends Acceptor implements Runnable {
s.setTcpNoDelay(this.tcpNoDelay);
if (communicationMode == CLIENT_TO_SERVER || communicationMode == GATEWAY_TO_GATEWAY
- || communicationMode == MONITOR_TO_SERVER
- || communicationMode == CLIENT_TO_SERVER_FOR_QUEUE) {
+ || communicationMode == MONITOR_TO_SERVER || communicationMode == CLIENT_TO_SERVER_FOR_QUEUE
+ || communicationMode == CLIENT_TO_SERVER_NEW_PROTOCOL) {
String communicationModeStr = "";
switch (communicationMode) {
case CLIENT_TO_SERVER:
@@ -1440,6 +1440,9 @@ public class AcceptorImpl extends Acceptor implements Runnable {
case CLIENT_TO_SERVER_FOR_QUEUE:
communicationModeStr = "clientToServerForQueue";
break;
+ case CLIENT_TO_SERVER_NEW_PROTOCOL:
+ communicationModeStr = "clientToServerForNewProtocol";
+ break;
}
if (logger.isDebugEnabled()) {
logger.debug("Bridge server: Initializing {} communication socket: {}",
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
new file mode 100644
index 0000000..aa6d4cb
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.cache.tier.sockets;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.serialization.Deserializer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public interface ClientProtocolMessageHandler {
+ void receiveMessage(InputStream inputStream, OutputStream outputStream, Deserializer serializer,
+ Cache cache) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 388f838..77a3be9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -337,6 +337,14 @@ public class HandShake implements ClientHandShake {
this.credentials = null;
}
+ public HandShake(ClientProxyMembershipID id, DistributedSystem sys, Version v) {
+ this.id = id;
+ this.code = REPLY_OK;
+ this.system = sys;
+ this.credentials = null;
+ this.clientVersion = v;
+ }
+
public void updateProxyID(InternalDistributedMember idm) {
this.id.updateID(idm);
}
@@ -1177,6 +1185,19 @@ public class HandShake implements ClientHandShake {
return new InternalDistributedMember(sock.getInetAddress(), sock.getPort(), false);
}
+ public void writeNewProtcolVersionForServer(Connection conn, byte communicationMode)
+ throws IOException {
+ Socket sock = conn.getSocket();
+ try {
+ DataOutputStream dos = new DataOutputStream(sock.getOutputStream());
+ dos.writeByte(communicationMode);
+ } catch (IOException ex) {
+ CancelCriterion stopper = this.system.getCancelCriterion();
+ stopper.checkCancelInProgress(null);
+ throw ex;
+ }
+ }
+
/**
* Client-side handshake with a Server
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 83d0e9d..e58e213 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -19,19 +19,25 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.security.Principal;
+import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
+import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.geode.serialization.SerializationType;
import org.apache.logging.log4j.Logger;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadState;
@@ -42,6 +48,7 @@ import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.internal.AbstractOp;
import org.apache.geode.cache.client.internal.Connection;
+import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
@@ -147,6 +154,9 @@ public class ServerConnection implements Runnable {
private final CachedRegionHelper crHelper;
private String name = null;
+ // The new protocol lives in a separate module and gets loaded when this class is instantiated.
+ private static ClientProtocolMessageHandler newClientProtocol;
+
// IMPORTANT: if new messages are added change setHandshake to initialize them
// to the correct Version for serializing to the client
private Message requestMsg = new Message(2, Version.CURRENT);
@@ -180,7 +190,9 @@ public class ServerConnection implements Runnable {
*/
private volatile int requestSpecificTimeout = -1;
- /** Tracks the id of the most recent batch to which a reply has been sent */
+ /**
+ * Tracks the id of the most recent batch to which a reply has been sent
+ */
private int latestBatchIdReplied = -1;
/*
@@ -276,6 +288,21 @@ public class ServerConnection implements Runnable {
this.postAuthzRequest = null;
this.randomConnectionIdGen = new Random(this.hashCode());
+ if (newClientProtocol == null) {
+ Iterator<ClientProtocolMessageHandler> protocolIterator =
+ ServiceLoader.load(ClientProtocolMessageHandler.class).iterator();
+ if (protocolIterator.hasNext()) {
+ newClientProtocol = protocolIterator.next();
+ } else {
+ logger.warn("Implementation not found in the JVM for ClientProtocolMessageHandler");
+ }
+ // TODO handle multiple ClientProtocolMessageHandler impls.
+ if (protocolIterator.hasNext()) {
+ logger.warn(
+ "Multiple implementations found in the JVM for ClientProtocolMessageHandler; using the first one available.");
+ }
+ }
+
final boolean isDebugEnabled = logger.isDebugEnabled();
try {
// requestMsg.setUseDataStream(useDataStream);
@@ -319,11 +346,25 @@ public class ServerConnection implements Runnable {
return executeFunctionOnLocalNodeOnly.get();
}
+ private boolean createClientHandshake() {
+ logger.info("createClientHandshake this.getCommunicationMode() " + this.getCommunicationMode());
+ if (this.getCommunicationMode() != AcceptorImpl.CLIENT_TO_SERVER_NEW_PROTOCOL) {
+ return ServerHandShakeProcessor.readHandShake(this);
+ } else {
+ InetSocketAddress remoteAddress = (InetSocketAddress) theSocket.getRemoteSocketAddress();
+ DistributedMember member =
+ new InternalDistributedMember(remoteAddress.getAddress(), remoteAddress.getPort());
+ this.proxyId = new ClientProxyMembershipID(member);
+ this.handshake = new HandShake(this.proxyId, this.getDistributedSystem(), Version.CURRENT);
+ return true;
+ }
+ }
+
private boolean verifyClientConnection() {
synchronized (this.handShakeMonitor) {
if (this.handshake == null) {
// synchronized (getCleanupTable()) {
- boolean readHandShake = ServerHandShakeProcessor.readHandShake(this);
+ boolean readHandShake = createClientHandshake();
if (readHandShake) {
if (this.handshake.isOK()) {
try {
@@ -593,8 +634,10 @@ public class ServerConnection implements Runnable {
private boolean acceptHandShake(byte epType, int qSize) {
try {
- this.handshake.accept(theSocket.getOutputStream(), theSocket.getInputStream(), epType, qSize,
- this.communicationMode, this.principal);
+ if (this.communicationMode != AcceptorImpl.CLIENT_TO_SERVER_NEW_PROTOCOL) {
+ this.handshake.accept(theSocket.getOutputStream(), theSocket.getInputStream(), epType,
+ qSize, this.communicationMode, this.principal);
+ }
} catch (IOException ioe) {
if (!crHelper.isShutdown() && !isTerminated()) {
logger.warn(LocalizedMessage.create(
@@ -905,6 +948,22 @@ public class ServerConnection implements Runnable {
}
private void doOneMessage() {
+ boolean useNewClientProtocol =
+ this.communicationMode == AcceptorImpl.CLIENT_TO_SERVER_NEW_PROTOCOL;
+ if (useNewClientProtocol) {
+ try {
+ Socket socket = this.getSocket();
+ InputStream inputStream = socket.getInputStream();
+ OutputStream outputStream = socket.getOutputStream();
+ // TODO serialization types?
+ newClientProtocol.receiveMessage(inputStream, outputStream,
+ SerializationType.STRING.deserializer, this.getCache());
+ } catch (IOException e) {
+ // TODO?
+ }
+ return;
+ }
+
if (this.doHandshake) {
doHandshake();
this.doHandshake = false;
@@ -914,6 +973,7 @@ public class ServerConnection implements Runnable {
}
}
+
private void initializeClientUserAuths() {
this.clientUserAuths = getClientUserAuths(this.proxyId);
}
@@ -1070,7 +1130,7 @@ public class ServerConnection implements Runnable {
/**
* MessageType of the messages (typically internal commands) which do not need to participate in
* security should be added in the following if block.
- *
+ *
* @return Part
* @see AbstractOp#processSecureBytes(Connection, Message)
* @see AbstractOp#needsUserId()
@@ -1191,6 +1251,7 @@ public class ServerConnection implements Runnable {
* If registered with a selector then this will be the key we are registered with.
*/
// private SelectionKey sKey = null;
+
/**
* Register this connection with the given selector for read events. Note that switch the channel
* to non-blocking so it can be in a selector.
@@ -1206,7 +1267,8 @@ public class ServerConnection implements Runnable {
}
public void registerWithSelector2(Selector s) throws IOException {
- /* this.sKey = */getSelectableChannel().register(s, SelectionKey.OP_READ, this);
+ /* this.sKey = */
+ getSelectableChannel().register(s, SelectionKey.OP_READ, this);
}
/**
@@ -1229,7 +1291,6 @@ public class ServerConnection implements Runnable {
}
/**
- *
* @return String representing the DistributedSystemMembership of the Client VM
*/
public String getMembershipID() {
@@ -1497,7 +1558,7 @@ public class ServerConnection implements Runnable {
/**
* Just ensure that this class gets loaded.
- *
+ *
* @see SystemFailure#loadEmergencyClasses()
*/
public static void loadEmergencyClasses() {
@@ -1524,7 +1585,9 @@ public class ServerConnection implements Runnable {
return this.name;
}
- /** returns the name of this connection */
+ /**
+ * returns the name of this connection
+ */
public String getName() {
return this.name;
}
@@ -1808,7 +1871,9 @@ public class ServerConnection implements Runnable {
return postAuthReq;
}
- /** returns the member ID byte array to be used for creating EventID objects */
+ /**
+ * returns the member ID byte array to be used for creating EventID objects
+ */
public byte[] getEventMemberIDByteArray() {
return this.memberIdByteArray;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/serialization/Deserializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/serialization/Deserializer.java b/geode-core/src/main/java/org/apache/geode/serialization/Deserializer.java
new file mode 100644
index 0000000..e4cd20c
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/serialization/Deserializer.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.serialization;
+
+public interface Deserializer<T> {
+ public abstract T deserialize(byte[] bytes);
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/serialization/FunctionalSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/serialization/FunctionalSerializer.java b/geode-core/src/main/java/org/apache/geode/serialization/FunctionalSerializer.java
new file mode 100644
index 0000000..a3259db
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/serialization/FunctionalSerializer.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.serialization;
+
+public class FunctionalSerializer<T> implements Serializer<T>, Deserializer<T> {
+ public final Serializer<T> serializer;
+ public final Deserializer<T> deserializer;
+
+ public FunctionalSerializer(Serializer<T> serializer, Deserializer<T> deserializer) {
+ this.serializer = serializer;
+ this.deserializer = deserializer;
+ }
+
+ @Override
+ public T deserialize(byte[] bytes) {
+ return deserializer.deserialize(bytes);
+ }
+
+ @Override
+ public byte[] serialize(T item) {
+ return serializer.serialize(item);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/serialization/SerializationType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/serialization/SerializationType.java b/geode-core/src/main/java/org/apache/geode/serialization/SerializationType.java
new file mode 100644
index 0000000..2ea4066
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/serialization/SerializationType.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.serialization;
+
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
+
+public enum SerializationType {
+ STRING(String.class, String::getBytes, String::new),
+ BYTE_BLOB(byte[].class, (x) -> x, (x) -> x),
+ JSON(PdxInstance.class, JSONFormatter::toJSONByteArray, JSONFormatter::fromJSON);
+
+ public final Class klass;
+ public final Serializer serializer;
+ public final Deserializer deserializer;
+
+ <T> SerializationType(Class<T> klass, Serializer<T> serializer, Deserializer<T> deserializer) {
+ this.klass = klass;
+ this.serializer = serializer;
+ this.deserializer = deserializer;
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/main/java/org/apache/geode/serialization/Serializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/serialization/Serializer.java b/geode-core/src/main/java/org/apache/geode/serialization/Serializer.java
new file mode 100644
index 0000000..6be877f
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/serialization/Serializer.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.serialization;
+
+public interface Serializer<T> {
+ public abstract byte[] serialize(T item);
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 6fcdf4c..0272285 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -593,7 +593,10 @@ public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
}
private int createServerRegion(final Class constraintClass) throws IOException {
- CacheFactory cf = new CacheFactory(getDistributedSystemProperties());
+ Properties p = getDistributedSystemProperties();
+ p.put("log-level", "debug");
+ CacheFactory cf = new CacheFactory();
+
Cache cache = getCache(cf);
RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
rf.setValueConstraint(constraintClass);
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index f8018b6..7e1d61d 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -120,11 +120,7 @@ rat {
'geode-core/src/test/resources/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.xml',
'geode-core/src/test/resources/org/apache/geode/management/internal/configuration/utils/*.xml',
- '**/META-INF/services/org.xml.sax.ext.EntityResolver2',
- '**/META-INF/services/org.apache.geode.internal.cache.CacheService',
- '**/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser',
- '**/META-INF/services/org.apache.geode.distributed.ServerLauncherCacheProvider',
- '**/META-INF/services/org.springframework.shell.core.CommandMarker',
+ '**/META-INF/services/*',
// --- Other Licenses ---
http://git-wip-us.apache.org/repos/asf/geode/blob/511e2a35/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index c0fdb6e..3efc2dc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,7 @@
*/
rootProject.name = 'geode'
+include 'geode-client-protobuf'
include 'geode-old-versions'
include 'geode-common'
include 'geode-json'
[27/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
index 4d7c37b..ed4ed05 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -15,43 +15,74 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEntryHeap {
- public VMStatsDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,10 +90,11 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -82,7 +114,7 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -93,19 +125,22 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -122,7 +157,7 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -130,7 +165,9 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -155,7 +192,6 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -195,108 +231,113 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -306,7 +347,7 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -316,13 +357,14 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -331,12 +373,12 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -349,14 +391,15 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -368,13 +411,17 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -387,5 +434,8 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
index 856ebc6..9c1fc62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -15,46 +15,76 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -63,6 +93,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +124,19 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +152,9 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +178,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,19 +189,22 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -179,7 +221,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -187,7 +229,9 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -212,7 +256,6 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -252,108 +295,113 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -363,7 +411,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -373,6 +421,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapIntKey.class,
"hitCount");
@@ -381,7 +430,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -390,12 +439,12 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -408,14 +457,15 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -427,12 +477,18 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -443,5 +499,8 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
index 53c24e7..80da3c2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -15,46 +15,76 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -63,6 +93,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +124,19 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +152,9 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +178,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,19 +189,22 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -179,7 +221,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -187,7 +229,9 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -212,7 +256,6 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -252,108 +295,113 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -363,7 +411,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -373,6 +421,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapLongKey.class,
"hitCount");
@@ -381,7 +430,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -390,12 +439,12 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -408,14 +457,15 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -427,12 +477,16 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -443,5 +497,8 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
index 816c0aa..3148438 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -15,46 +15,75 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -63,6 +92,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -94,13 +124,19 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -116,7 +152,9 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -140,7 +178,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -151,19 +189,22 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -180,7 +221,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -188,7 +229,9 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -213,7 +256,6 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -253,108 +295,113 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -364,7 +411,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -374,6 +421,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -382,7 +430,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -391,12 +439,12 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -409,14 +457,15 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -428,13 +477,20 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
index 74facf4..9d0794e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -15,42 +15,68 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -69,9 +95,11 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -80,6 +108,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -111,13 +140,19 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -133,7 +168,9 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -157,7 +194,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -168,19 +205,22 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -197,7 +237,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -205,7 +245,9 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -230,7 +272,6 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -270,108 +311,113 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -381,7 +427,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -391,6 +437,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -399,7 +446,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -408,12 +455,12 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -426,14 +473,15 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -445,8 +493,12 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -460,7 +512,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -479,6 +531,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -508,5 +561,8 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
index 653e4a5..93cff9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -15,42 +15,68 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -81,9 +107,11 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -92,6 +120,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -123,13 +152,19 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -145,7 +180,9 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -169,7 +206,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -180,19 +217,22 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -209,7 +249,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -217,7 +257,9 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -242,7 +284,6 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -282,108 +323,113 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -393,7 +439,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -403,6 +449,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapStringKey2.class,
"hitCount");
@@ -411,7 +458,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -420,12 +467,12 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -438,14 +485,15 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -457,8 +505,12 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -477,7 +529,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -507,6 +559,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -549,5 +602,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[17/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
index dec4f9f..154825a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
@@ -15,25 +15,36 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -41,7 +52,8 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,10 +61,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapStringKey2
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -83,9 +110,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -94,10 +123,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -117,7 +147,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -128,19 +158,22 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -157,7 +190,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -165,7 +198,9 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -190,7 +225,6 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -230,108 +264,113 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -341,7 +380,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -351,6 +390,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapStringKey2.class,
"hitCount");
@@ -359,7 +399,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -368,12 +408,12 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -386,14 +426,15 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -405,7 +446,10 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -422,6 +466,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -439,6 +484,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -468,6 +514,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -500,8 +547,11 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -520,7 +570,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -550,6 +600,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -592,5 +643,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
index b4934ed..4e201b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -15,34 +15,47 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -50,15 +63,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
extends VersionedStatsDiskLRURegionEntryHeap {
public VersionedStatsDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -67,10 +99,11 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -90,7 +123,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -101,19 +134,22 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -130,7 +166,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -138,7 +174,9 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -163,7 +201,6 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -203,108 +240,113 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -314,7 +356,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -324,6 +366,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryHeapUUIDKey.class,
"hitCount");
@@ -332,7 +375,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -341,12 +384,12 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -359,14 +402,15 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -378,7 +422,10 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -395,6 +442,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -412,6 +460,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -441,6 +490,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -473,13 +523,16 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -492,5 +545,8 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
index 6c5850e..a3df7e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -15,37 +15,50 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,14 +66,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -69,6 +101,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -100,13 +133,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -122,7 +161,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -146,7 +187,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -157,19 +198,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -186,7 +230,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -194,7 +238,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -219,7 +265,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -259,108 +304,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -370,7 +420,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -380,6 +430,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapIntKey.class,
"hitCount");
@@ -388,7 +439,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -397,12 +448,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -415,14 +466,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -434,7 +486,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -451,6 +506,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -468,6 +524,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -497,6 +554,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -529,12 +587,17 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -545,5 +608,8 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
index b9d60c5..d15b7fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -15,37 +15,50 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,14 +66,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -69,6 +101,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -100,13 +133,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -122,7 +161,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -146,7 +187,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -157,19 +198,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -186,7 +230,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -194,7 +238,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -219,7 +265,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -259,108 +304,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -370,7 +420,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -380,6 +430,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapLongKey.class,
"hitCount");
@@ -388,7 +439,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -397,12 +448,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -415,14 +466,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -434,7 +486,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -451,6 +506,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -468,6 +524,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -497,6 +554,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -529,12 +587,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -545,5 +606,8 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
index 63098fa..a8f1e2a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -15,37 +15,50 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,14 +66,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -69,6 +100,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -100,13 +132,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -122,7 +160,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -146,7 +186,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -157,19 +197,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -186,7 +229,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -194,7 +237,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -219,7 +264,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -259,108 +303,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -370,7 +419,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -380,6 +429,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapObjectKey.class,
"hitCount");
@@ -388,7 +438,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -397,12 +447,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -415,14 +465,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -434,7 +485,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -451,6 +505,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -468,6 +523,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -497,6 +553,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -529,13 +586,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
index 45cbc49..0ced50b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -15,37 +15,50 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
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;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// disk: 1
+// lru: 1
+// stats: 1
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,10 +66,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
extends VersionedStatsDiskLRURegionEntryOffHeap {
public VersionedStatsDiskLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -75,9 +103,11 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -86,6 +116,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -117,13 +148,19 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -139,7 +176,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -163,7 +202,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -174,19 +213,22 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -203,7 +245,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -211,7 +253,9 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -236,7 +280,6 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -276,108 +319,113 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -387,7 +435,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -397,6 +445,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VersionedStatsDiskLRURegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VersionedStatsDiskLRURegionEntryOffHeapStringKey1.class,
"hitCount");
@@ -405,7 +454,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -414,12 +463,12 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -432,14 +481,15 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -451,7 +501,10 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -468,6 +521,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -485,6 +539,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -514,6 +569,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -546,8 +602,11 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -561,7 +620,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -580,6 +639,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -609,5 +669,8 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[57/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 0b11bf1..388f838 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -14,7 +14,49 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.CONFLATE_EVENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.cache.GatewayConfigurationException;
+import org.apache.geode.cache.client.PoolFactory;
+import org.apache.geode.cache.client.ServerRefusedConnectionException;
+import org.apache.geode.cache.client.internal.Connection;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.LonerDistributionManager;
+import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.ClassLoadUtil;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataInputStream;
+import org.apache.geode.internal.VersionedDataOutputStream;
+import org.apache.geode.internal.cache.tier.Acceptor;
+import org.apache.geode.internal.cache.tier.ClientHandShake;
+import org.apache.geode.internal.cache.tier.ConnectionProxy;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.pdx.internal.PeerTypeRegistration;
+import org.apache.geode.security.AuthInitialize;
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.AuthenticationRequiredException;
+import org.apache.geode.security.Authenticator;
+import org.apache.geode.security.GemFireSecurityException;
+import org.apache.logging.log4j.Logger;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@@ -49,7 +91,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import javax.crypto.Cipher;
import javax.crypto.KeyAgreement;
import javax.crypto.SecretKey;
@@ -58,46 +99,6 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLSocket;
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.InternalGemFireException;
-import org.apache.geode.cache.GatewayConfigurationException;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.ServerRefusedConnectionException;
-import org.apache.geode.cache.client.internal.Connection;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.LonerDistributionManager;
-import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ClassLoadUtil;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.InternalInstantiator;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.internal.VersionedDataOutputStream;
-import org.apache.geode.internal.cache.tier.Acceptor;
-import org.apache.geode.internal.cache.tier.ClientHandShake;
-import org.apache.geode.internal.cache.tier.ConnectionProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import org.apache.geode.security.AuthInitialize;
-import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.security.AuthenticationRequiredException;
-import org.apache.geode.security.Authenticator;
-import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
public class HandShake implements ClientHandShake {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/lang/StringUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/StringUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/StringUtils.java
index 499d546..8a44564 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/StringUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/StringUtils.java
@@ -22,91 +22,30 @@ import org.apache.geode.internal.cache.Token;
* The StringUtils is an abstract utility class for working with and invoking operations on String
* literals.
* <p/>
- *
+ *
* @see java.lang.String
* @since GemFire 7.0
*/
@SuppressWarnings("unused")
-public abstract class StringUtils {
+@Deprecated
+public class StringUtils extends org.apache.commons.lang.StringUtils {
public static final String COMMA_DELIMITER = ",";
- public static final String EMPTY_STRING = "";
public static final String LINE_SEPARATOR = System.getProperty("line.separator");
public static final String SPACE = " ";
- public static final String UTF_8 = "UTF-8";
-
- public static final String[] EMPTY_STRING_ARRAY = new String[0];
- public static final String[] SPACES = {"", " ", " ", " ", " ", " ", " ", " ",
- " ", " ", " "};
-
- /**
- * Concatenates all Objects in the array into a single String by calling toString on the Object.
- * </p>
- *
- * @param values the Object elements of the array to be concatenated into the String.
- * @return a single String with all the individual Objects in the array concatenated.
- * @see #concat(Object[], String)
- */
- public static String concat(final Object... values) {
- return concat(values, EMPTY_STRING);
- }
-
- /**
- * Concatenates all Objects in the array into a single String using the Object's toString method,
- * delimited by the specified delimiter.
- * </p>
- *
- * @param values an array of Objects to concatenate into a single String value.
- * @param delimiter the String value to use as a separator between the individual Object values.
- * If delimiter is null, then a empty String is used.
- * @return a single String with all the individual Objects of the array concatenated together,
- * separated by the specified delimiter.
- * @see java.lang.Object#toString()
- * @see java.lang.StringBuilder
- */
- public static String concat(final Object[] values, String delimiter) {
- delimiter = ObjectUtils.defaultIfNull(delimiter, EMPTY_STRING);
-
- final StringBuilder buffer = new StringBuilder();
- int count = 0;
-
- if (values != null) {
- for (Object value : values) {
- buffer.append(count++ > 0 ? delimiter : EMPTY_STRING);
- buffer.append(value);
- }
- }
-
- return buffer.toString();
- }
+ private static final int MAX_ARRAY_ELEMENTS_TO_CONVERT =
+ Integer.getInteger("StringUtils.MAX_ARRAY_ELEMENTS_TO_CONVERT", 16);
- /**
- * Returns the first non-null, non-empty and non-blank String value in the array of String values.
- * </p>
- *
- * @param values an array of String values, usually consisting of the preferred value followed by
- * default values if any value in the array of String values is null, empty or blank.
- * @return the first non-null, non-empty and non-blank String value in the array of Strings. If
- * all values are either null, empty or blank then null is returned.
- * @see #isBlank(String)
- */
- public static String defaultIfBlank(final String... values) {
- if (values != null) {
- for (final String value : values) {
- if (!isBlank(value)) {
- return value;
- }
- }
- }
- return null;
+ public static String nullifyIfBlank(final String value) {
+ return isBlank(value) ? null : value;
}
/**
* Returns only the digits (0..9) from the specified String value.
* </p>
- *
+ *
* @param value the String value from which to extract digits.
* @return only the digits from the specified String value. If the String is null or contains no
* digits, then this method returns an empty String.
@@ -126,156 +65,7 @@ public abstract class StringUtils {
return buffer.toString();
}
- /**
- * Returns only the letters (a..zA..Z) from the specified String value.
- * </p>
- *
- * @param value the String value from which to extract letters.
- * @return only the letters from the specified String value. If the String is null or contains no
- * letters, then this method returns an empty String.
- * @see java.lang.Character#isLetter(char)
- */
- public static String getLettersOnly(final String value) {
- final StringBuilder buffer = new StringBuilder();
-
- if (value != null) {
- for (final char chr : value.toCharArray()) {
- if (Character.isLetter(chr)) {
- buffer.append(chr);
- }
- }
- }
-
- return buffer.toString();
- }
-
- /**
- * Gets a number of spaces determined by number.
- * </p>
- *
- * @param number an integer value indicating the number of spaces to return.
- * @return a String value containing a number of spaces given by number.
- */
- public static String getSpaces(int number) {
- final StringBuilder spaces = new StringBuilder(SPACES[Math.min(number, SPACES.length - 1)]);
-
- do {
- number -= (SPACES.length - 1);
- number = Math.max(number, 0);
- spaces.append(SPACES[Math.min(number, SPACES.length - 1)]);
- } while (number > 0);
-
- return spaces.toString();
- }
-
- /**
- * Determines whether the specified String value is blank, which is true if it is null, an empty
- * String or a String containing only spaces (blanks).
- * </p>
- *
- * @param value the String value used in the determination for the "blank" check.
- * @return a boolean value indicating whether the specified String is blank.
- * @see #isEmpty(String)
- */
- public static boolean isBlank(final String value) {
- return (value == null || EMPTY_STRING.equals(value.trim()));
- }
-
- /**
- * Determines whether the specified String value is empty, which is true if and only if the value
- * is the empty String.
- * </p>
- *
- * @param value the String value used in the determination of the "empty" check.
- * @return a boolean value indicating if the specified String is empty.
- * @see #isBlank(String)
- */
- public static boolean isEmpty(final String value) {
- return EMPTY_STRING.equals(value);
- }
-
- /**
- * Pads the specified String value by appending the specified character up to the given length.
- * </p>
- *
- * @param value the String value to pad by appending 'paddingCharacter' to the end.
- * @param paddingCharacter the character used to pad the end of the String value.
- * @param length an int value indicating the final length of the String value with padding of the
- * 'paddingCharacter'.
- * @return the String value padded with the specified character by appending 'paddingCharacter' to
- * the end of the String value up to the given length.
- * @throws NullPointerException if the String value is null.
- */
- public static String padEnding(final String value, final char paddingCharacter,
- final int length) {
- if (value == null) {
- throw new NullPointerException("The String value to pad cannot be null!");
- }
-
- final StringBuilder buffer = new StringBuilder(value);
-
- for (int valueLength = value.length(); valueLength < length; valueLength++) {
- buffer.append(paddingCharacter);
- }
-
- return buffer.toString();
- }
-
- /**
- * A null-safe implementation of the String.toLowerCase method.
- * </p>
- *
- * @param value a String value to convert to lower case.
- * @return a lower case representation of the specified String value.
- * @see java.lang.String#toLowerCase()
- */
- public static String toLowerCase(final String value) {
- return (value == null ? null : value.toLowerCase());
- }
-
- /**
- * A null-safe implementation of the String.toUpperCase method.
- * </p>
- *
- * @param value a String value to convert to upper case.
- * @return an upper case representation of the specified String value.
- * @see java.lang.String#toUpperCase()
- */
- public static String toUpperCase(final String value) {
- return (value == null ? null : value.toUpperCase());
- }
- /**
- * A method to trim the value of a String and guard against null values.
- * <p/>
- *
- * @param value the String value that will be trimmed if not null.
- * @return null if the String value is null or the trimmed version of the String value if String
- * value is not null.
- * @see java.lang.String#trim()
- */
- public static String trim(final String value) {
- return (value == null ? null : value.trim());
- }
-
- /**
- * Null-safe implementation of String truncate using substring. Truncates the specified String
- * value to the specified length. Returns null if the String value is null.
- * </p>
- *
- * @param value the String value to truncate.
- * @param length an int value indicating the length to truncate the String value to.
- * @return the String value truncated to specified length, or null if the String value is null.
- * @throws IllegalArgumentException if the value of length is less than 0.
- * @see java.lang.String#substring(int, int)
- */
- public static String truncate(final String value, final int length) {
- if (length < 0) {
- throw new IllegalArgumentException("Length must be greater than equal to 0!");
- }
-
- return (value == null ? null : value.substring(0, Math.min(value.length(), length)));
- }
/**
* Gets the value of the specified Object as a String. If the Object is null then the first
@@ -283,9 +73,9 @@ public abstract class StringUtils {
* String values is null or all the elements in the default String values array are null, then the
* value of String.valueOf(value) is returned.
* </p>
- *
+ *
* @param value the Object who's String representation is being evaluated.
- * @param defaultValues an array of default String values to assess if the specified Object value
+ * @param defaultValue an array of default String values to assess if the specified Object value
* is null.
* @return a String representation of the specified Object value or one of the default String
* values from the array if the Object value is null. If either the default String array
@@ -293,20 +83,12 @@ public abstract class StringUtils {
* returned.
* @see java.lang.String#valueOf(Object)
*/
- public static String valueOf(final Object value, final String... defaultValues) {
- if (value != null) {
- return value.toString();
- } else {
- if (defaultValues != null) {
- for (String defaultValue : defaultValues) {
- if (defaultValue != null) {
- return defaultValue;
- }
- }
- }
+ public static String defaultString(final Object value, final String defaultValue) {
+ return value == null ? defaultValue : value.toString();
+ }
- return String.valueOf(value);
- }
+ public static String defaultString(final Object value) {
+ return value == null ? EMPTY : value.toString();
}
/**
@@ -314,7 +96,7 @@ public abstract class StringUtils {
* characters in each line, indenting all subsequent lines with the indent. If the indent is null,
* then an empty String is used.
* </p>
- *
+ *
* @param line a String containing the line of text to wrap.
* @param widthInCharacters an integer value indicating the width of each line measured by the
* number of characters.
@@ -324,18 +106,19 @@ public abstract class StringUtils {
* boundaries within the given width on any given split.
* @throws NullPointerException if the line of text is null.
*/
+ // Can be removed when commons is updated.
public static String wrap(String line, final int widthInCharacters, String indent) {
final StringBuilder buffer = new StringBuilder();
int lineCount = 1;
- int spaceIndex = -1;
+ int spaceIndex;
// if indent is null, then do not indent the wrapped lines
- indent = valueOf(indent, EMPTY_STRING);
+ indent = StringUtils.defaultString(indent);
while (line.length() > widthInCharacters) {
spaceIndex = line.substring(0, widthInCharacters).lastIndexOf(SPACE);
- buffer.append(lineCount++ > 1 ? indent : EMPTY_STRING);
+ buffer.append(lineCount++ > 1 ? indent : EMPTY);
// throws IndexOutOfBoundsException if spaceIndex is -1, implying no word boundary was found
// within
// the given width; this also avoids the infinite loop
@@ -351,13 +134,10 @@ public abstract class StringUtils {
return buffer.toString();
}
- private static final int MAX_ARRAY_ELEMENTS_TO_CONVERT =
- Integer.getInteger("StringUtils.MAX_ARRAY_ELEMENTS_TO_CONVERT", 16);
-
/**
* Used to convert the given object to a String. If anything goes wrong in this conversion put
* some info about what went wrong on the result string but do not throw an exception.
- *
+ *
* @param o the object to convert to a string
* @return the string from of the given object.
*/
@@ -373,7 +153,7 @@ public abstract class StringUtils {
* Convert an object to a string and return it. Handled CacheDeserializables without having them
* change the form they store. If deserialization is needed and fails then the string contains a
* message saying so instead of throwing an exception.
- *
+ *
* @param o the object to convert to a string
* @param convertArrayContents if true then the contents of the array will be in the string;
* otherwise just the array identity
@@ -414,13 +194,15 @@ public abstract class StringUtils {
}
}
- private static String arrayToString(Object[] a, int maxArrayElements) {
+
+ private static <T> String arrayToString(T[] a, int maxArrayElements) {
if (maxArrayElements < 0) {
maxArrayElements = 0;
}
if (a == null) {
return "null";
}
+ String className = a.getClass().getSimpleName();
int iMax = a.length;
if (iMax > maxArrayElements) {
iMax = maxArrayElements;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
index 2e47556..4c50851 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemUtils.java
@@ -80,8 +80,8 @@ public class SystemUtils {
actualVersionDigits = StringUtils.getDigitsOnly(System.getProperty("java.version"));
}
- String expectedVersionDigits = StringUtils.padEnding(StringUtils.getDigitsOnly(expectedVersion),
- '0', actualVersionDigits.length());
+ String expectedVersionDigits = StringUtils.rightPad(StringUtils.getDigitsOnly(expectedVersion),
+ actualVersionDigits.length(), '0');
try {
return Long.parseLong(actualVersionDigits) >= Long.parseLong(expectedVersionDigits);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java b/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
index 629740c..c8ec49d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/FileProcessController.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.process;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -101,8 +102,7 @@ public class FileProcessController implements ProcessController {
LocalizedStrings.Launcher_ATTACH_API_NOT_FOUND_ERROR_MESSAGE.toLocalizedString());
}
- private void stop(final File workingDir, final String stopRequestFileName)
- throws UnableToControlProcessException, IOException {
+ private void stop(final File workingDir, final String stopRequestFileName) throws IOException {
final File stopRequestFile = new File(workingDir, stopRequestFileName);
if (!stopRequestFile.exists()) {
stopRequestFile.createNewFile();
@@ -110,11 +110,10 @@ public class FileProcessController implements ProcessController {
}
private String status(final File workingDir, final String statusRequestFileName,
- final String statusFileName)
- throws UnableToControlProcessException, IOException, InterruptedException, TimeoutException {
+ final String statusFileName) throws IOException, InterruptedException, TimeoutException {
// monitor for statusFile
final File statusFile = new File(workingDir, statusFileName);
- final AtomicReference<String> statusRef = new AtomicReference<String>();
+ final AtomicReference<String> statusRef = new AtomicReference<>();
final ControlRequestHandler statusHandler = new ControlRequestHandler() {
@Override
@@ -162,7 +161,7 @@ public class FileProcessController implements ProcessController {
}
final String lines = statusRef.get();
- if (null == lines || lines.trim().isEmpty()) {
+ if (StringUtils.isBlank(lines)) {
throw new IllegalStateException("Failed to read status file");
}
return lines;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/process/signal/Signal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/process/signal/Signal.java b/geode-core/src/main/java/org/apache/geode/internal/process/signal/Signal.java
index faab4ed..78b19db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/process/signal/Signal.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/process/signal/Signal.java
@@ -15,7 +15,7 @@
package org.apache.geode.internal.process.signal;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Signals defined in the enumerated type were based on Open BSD and the IBM JVM...
@@ -78,7 +78,7 @@ public enum Signal {
private final String name;
Signal(final int number, final String name, final SignalType type, final String description) {
- assertValidArgument(!StringUtils.isBlank(name), "The name of the signal must be specified!");
+ assertValidArgument(StringUtils.isNotBlank(name), "The name of the signal must be specified!");
this.number = number;
this.name = name;
this.type = type;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
index 8366930..600d546 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -293,7 +293,7 @@ public class IntegratedSecurityService implements SecurityService {
String clientAuthenticatorConfig = securityProps.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
String peerAuthenticatorConfig = securityProps.getProperty(SECURITY_PEER_AUTHENTICATOR);
- if (!StringUtils.isBlank(shiroConfig)) {
+ if (StringUtils.isNotBlank(shiroConfig)) {
IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:" + shiroConfig);
// we will need to make sure that shiro uses a case sensitive permission resolver
@@ -311,20 +311,20 @@ public class IntegratedSecurityService implements SecurityService {
isPeerAuthenticator = false;
}
// only set up shiro realm if user has implemented SecurityManager
- else if (!StringUtils.isBlank(securityManagerConfig)) {
+ else if (StringUtils.isNotBlank(securityManagerConfig)) {
SecurityManager securityManager = SecurityService
.getObjectOfTypeFromClassName(securityManagerConfig, SecurityManager.class);
securityManager.init(securityProps);
this.setSecurityManager(securityManager);
} else {
isIntegratedSecurity = null;
- isClientAuthenticator = !StringUtils.isBlank(clientAuthenticatorConfig);
- isPeerAuthenticator = !StringUtils.isBlank(peerAuthenticatorConfig);
+ isClientAuthenticator = StringUtils.isNotBlank(clientAuthenticatorConfig);
+ isPeerAuthenticator = StringUtils.isNotBlank(peerAuthenticatorConfig);
}
// this initializes the post processor
String customPostProcessor = securityProps.getProperty(SECURITY_POST_PROCESSOR);
- if (!StringUtils.isBlank(customPostProcessor)) {
+ if (StringUtils.isNotBlank(customPostProcessor)) {
postProcessor =
SecurityService.getObjectOfTypeFromClassName(customPostProcessor, PostProcessor.class);
postProcessor.init(securityProps);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
index 6f1c7cc..6f1292a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/ArrayUtils.java
@@ -15,15 +15,12 @@
package org.apache.geode.internal.util;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.internal.offheap.annotations.Unretained;
+
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
-import java.util.Objects;
-import java.util.RandomAccess;
-
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.offheap.annotations.Unretained;
/**
*
@@ -82,7 +79,7 @@ public abstract class ArrayUtils {
if (array != null) {
for (final Object element : array) {
- buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY_STRING).append(element);
+ buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY).append(element);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
index c1a1952..031f827 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.internal.util;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -186,7 +186,7 @@ public abstract class IOUtils {
public static String getFilename(final String pathname) {
String filename = pathname;
- if (!StringUtils.isBlank(filename)) {
+ if (StringUtils.isNotBlank(filename)) {
final int index = filename.lastIndexOf(File.separator);
filename = (index == -1 ? filename : filename.substring(index + 1));
}
@@ -205,7 +205,7 @@ public abstract class IOUtils {
* @see java.io.File#exists()
*/
public static boolean isExistingPathname(final String pathname) {
- return (!StringUtils.isBlank(pathname) && new File(pathname).exists());
+ return (StringUtils.isNotBlank(pathname) && new File(pathname).exists());
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
index ba15508..3bd442a 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java
@@ -15,8 +15,8 @@
package org.apache.geode.management.internal;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
@@ -53,7 +53,7 @@ public class AgentUtil {
*/
public String findWarLocation(String warFilePrefix) {
String geodeHome = getGeodeHome();
- if (!StringUtils.isBlank(geodeHome)) {
+ if (StringUtils.isNotBlank(geodeHome)) {
String[] possibleFiles =
{geodeHome + "/tools/Extensions/" + warFilePrefix + "-" + gemfireVersion + ".war",
geodeHome + "/tools/Pulse/" + warFilePrefix + "-" + gemfireVersion + ".war",
@@ -91,7 +91,7 @@ public class AgentUtil {
}
public boolean isWebApplicationAvailable(final String warFileLocation) {
- return !StringUtils.isBlank(warFileLocation);
+ return StringUtils.isNotBlank(warFileLocation);
}
public boolean isWebApplicationAvailable(final String... warFileLocations) {
@@ -124,6 +124,6 @@ public class AgentUtil {
public boolean isGemfireHomeDefined() {
String gemfireHome = getGeodeHome();
- return !StringUtils.isBlank(gemfireHome);
+ return StringUtils.isNotBlank(gemfireHome);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
index 7c26297..92987cb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JettyHelper.java
@@ -14,9 +14,10 @@
*/
package org.apache.geode.management.internal;
-import java.io.File;
-import java.util.concurrent.CountDownLatch;
-
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.Connector;
@@ -30,10 +31,8 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.logging.LogService;
+import java.io.File;
+import java.util.concurrent.CountDownLatch;
/**
* @since GemFire 8.1
@@ -70,13 +69,13 @@ public class JettyHelper {
if (sslConfig.isEnabled()) {
SslContextFactory sslContextFactory = new SslContextFactory();
- if (!StringUtils.isBlank(sslConfig.getAlias())) {
+ if (StringUtils.isNotBlank(sslConfig.getAlias())) {
sslContextFactory.setCertAlias(sslConfig.getAlias());
}
sslContextFactory.setNeedClientAuth(sslConfig.isRequireAuth());
- if (!StringUtils.isBlank(sslConfig.getCiphers())
+ if (StringUtils.isNotBlank(sslConfig.getCiphers())
&& !"any".equalsIgnoreCase(sslConfig.getCiphers())) {
// If use has mentioned "any" let the SSL layer decide on the ciphers
sslContextFactory.setIncludeCipherSuites(SSLUtil.readArray(sslConfig.getCiphers()));
@@ -97,19 +96,19 @@ public class JettyHelper {
sslContextFactory.setKeyStorePath(sslConfig.getKeystore());
- if (!StringUtils.isBlank(sslConfig.getKeystoreType())) {
+ if (StringUtils.isNotBlank(sslConfig.getKeystoreType())) {
sslContextFactory.setKeyStoreType(sslConfig.getKeystoreType());
}
- if (!StringUtils.isBlank(sslConfig.getKeystorePassword())) {
+ if (StringUtils.isNotBlank(sslConfig.getKeystorePassword())) {
sslContextFactory.setKeyStorePassword(sslConfig.getKeystorePassword());
}
- if (!StringUtils.isBlank(sslConfig.getTruststore())) {
+ if (StringUtils.isNotBlank(sslConfig.getTruststore())) {
sslContextFactory.setTrustStorePath(sslConfig.getTruststore());
}
- if (!StringUtils.isBlank(sslConfig.getTruststorePassword())) {
+ if (StringUtils.isNotBlank(sslConfig.getTruststorePassword())) {
sslContextFactory.setTrustStorePassword(sslConfig.getTruststorePassword());
}
@@ -131,7 +130,7 @@ public class JettyHelper {
jettyServer.setConnectors(new Connector[] {connector});
- if (!StringUtils.isBlank(bindAddress)) {
+ if (StringUtils.isNotBlank(bindAddress)) {
connector.setHost(bindAddress);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
index bf0b99c..3e6e4484 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
@@ -14,6 +14,32 @@
*/
package org.apache.geode.management.internal;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
+import org.apache.geode.internal.tcp.TCPConduit;
+import org.apache.geode.management.ManagementException;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.management.ManagerMXBean;
+import org.apache.geode.management.internal.security.AccessControlMBean;
+import org.apache.geode.management.internal.security.MBeanServerWrapper;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+
import java.io.IOException;
import java.io.Serializable;
import java.lang.management.ManagementFactory;
@@ -29,7 +55,6 @@ import java.rmi.server.RMIServerSocketFactory;
import java.rmi.server.UnicastRemoteObject;
import java.util.HashMap;
import java.util.Set;
-
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
@@ -43,33 +68,6 @@ import javax.management.remote.rmi.RMIJRMPServerImpl;
import javax.management.remote.rmi.RMIServerImpl;
import javax.rmi.ssl.SslRMIClientSocketFactory;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-
-import org.apache.geode.GemFireConfigException;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.net.SSLConfigurationFactory;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator;
-import org.apache.geode.internal.tcp.TCPConduit;
-import org.apache.geode.management.ManagementException;
-import org.apache.geode.management.ManagementService;
-import org.apache.geode.management.ManagerMXBean;
-import org.apache.geode.management.internal.security.AccessControlMBean;
-import org.apache.geode.management.internal.security.MBeanServerWrapper;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController;
-
/**
* Agent implementation that controls the JMX server end points for JMX clients to connect, such as
* an RMI server.
@@ -317,9 +315,9 @@ public class ManagementAgent {
}
private String getHost(final String bindAddress) throws UnknownHostException {
- if (!StringUtils.isBlank(this.config.getJmxManagerHostnameForClients())) {
+ if (StringUtils.isNotBlank(this.config.getJmxManagerHostnameForClients())) {
return this.config.getJmxManagerHostnameForClients();
- } else if (!StringUtils.isBlank(bindAddress)) {
+ } else if (StringUtils.isNotBlank(bindAddress)) {
return InetAddress.getByName(bindAddress).getHostAddress();
} else {
return SocketCreator.getLocalHost().getHostAddress();
@@ -376,7 +374,7 @@ public class ManagementAgent {
}
String jmxManagerHostnameForClients = this.config.getJmxManagerHostnameForClients();
- if (!StringUtils.isBlank(jmxManagerHostnameForClients)) {
+ if (StringUtils.isNotBlank(jmxManagerHostnameForClients)) {
System.setProperty("java.rmi.server.hostname", jmxManagerHostnameForClients);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
index 837e815..7c9256d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
@@ -14,13 +14,7 @@
*/
package org.apache.geode.management.internal;
-import java.net.UnknownHostException;
-
import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -29,12 +23,17 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.net.SSLConfigurationFactory;
-import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.management.ManagementService;
+import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+
+import java.net.UnknownHostException;
/**
* Agent implementation that controls the HTTP server end points used for REST clients to connect
@@ -156,15 +155,15 @@ public class RestAgent {
public static String getBindAddressForHttpService(DistributionConfig config) {
String bindAddress = config.getHttpServiceBindAddress();
- if (!StringUtils.isBlank(bindAddress))
+ if (StringUtils.isNotBlank(bindAddress))
return bindAddress;
bindAddress = config.getServerBindAddress();
- if (!StringUtils.isBlank(bindAddress))
+ if (StringUtils.isNotBlank(bindAddress))
return bindAddress;
bindAddress = config.getBindAddress();
- if (!StringUtils.isBlank(bindAddress))
+ if (StringUtils.isNotBlank(bindAddress))
return bindAddress;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
index 1b39b73..820e8a5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/SSLUtil.java
@@ -14,15 +14,14 @@
*/
package org.apache.geode.management.internal;
+import org.apache.commons.lang.StringUtils;
+
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
import javax.net.ssl.SSLContext;
-import org.apache.geode.internal.lang.StringUtils;
-
/**
*
* @since GemFire 8.1
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index ef643ac..770695a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -14,34 +14,7 @@
*/
package org.apache.geode.management.internal.beans;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.admin.internal.BackupDataStoreHelper;
import org.apache.geode.admin.internal.BackupDataStoreResult;
import org.apache.geode.cache.persistence.PersistentID;
@@ -89,6 +62,32 @@ import org.apache.geode.management.internal.beans.stats.GatewaySenderClusterStat
import org.apache.geode.management.internal.beans.stats.MemberClusterStatsMonitor;
import org.apache.geode.management.internal.beans.stats.ServerClusterStatsMonitor;
import org.apache.geode.management.internal.cli.json.TypedJson;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.management.InstanceNotFoundException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
/**
* This is the gateway to distributed system as a whole. Aggregated metrics and stats are shown
@@ -134,12 +133,12 @@ public class DistributedSystemBridge {
private volatile int serverSetSize;
/**
- * Gatway Sender Proxy set size
+ * Gateway Sender Proxy set size
*/
private volatile int gatewaySenderSetSize;
/**
- * Gatway Receiver Proxy set size
+ * Gateway Receiver Proxy set size
*/
private volatile int gatewayReceiverSetSize;
@@ -238,12 +237,12 @@ public class DistributedSystemBridge {
* @param service Management service
*/
public DistributedSystemBridge(SystemManagementService service) {
- this.distrLockServiceMap = new ConcurrentHashMap<ObjectName, DistributedLockServiceBridge>();
- this.distrRegionMap = new ConcurrentHashMap<ObjectName, DistributedRegionBridge>();
- this.mapOfMembers = new ConcurrentHashMap<ObjectName, MemberMXBean>();
- this.mapOfServers = new ConcurrentHashMap<ObjectName, CacheServerMXBean>();
- this.mapOfGatewayReceivers = new ConcurrentHashMap<ObjectName, GatewayReceiverMXBean>();
- this.mapOfGatewaySenders = new ConcurrentHashMap<ObjectName, GatewaySenderMXBean>();
+ this.distrLockServiceMap = new ConcurrentHashMap<>();
+ this.distrRegionMap = new ConcurrentHashMap<>();
+ this.mapOfMembers = new ConcurrentHashMap<>();
+ this.mapOfServers = new ConcurrentHashMap<>();
+ this.mapOfGatewayReceivers = new ConcurrentHashMap<>();
+ this.mapOfGatewaySenders = new ConcurrentHashMap<>();
this.service = service;
this.cache = GemFireCacheImpl.getInstance();
this.system = cache.getInternalDistributedSystem();
@@ -506,7 +505,7 @@ public class DistributedSystemBridge {
Iterator<DistributedMember> it = result.getSuccessfulMembers().keySet().iterator();
- Map<String, String[]> backedUpDiskStores = new HashMap<String, String[]>();
+ Map<String, String[]> backedUpDiskStores = new HashMap<>();
while (it.hasNext()) {
DistributedMember member = it.next();
Set<PersistentID> setOfDisk = result.getSuccessfulMembers().get(member);
@@ -573,7 +572,7 @@ public class DistributedSystemBridge {
Iterator<GatewayReceiverMXBean> gatewayReceiverIterator =
mapOfGatewayReceivers.values().iterator();
if (gatewayReceiverIterator != null) {
- List<String> listOfReceivers = new ArrayList<String>();
+ List<String> listOfReceivers = new ArrayList<>();
while (gatewayReceiverIterator.hasNext()) {
listOfReceivers.add(gatewayReceiverIterator.next().getBindAddress());
}
@@ -606,7 +605,7 @@ public class DistributedSystemBridge {
Iterator<MemberMXBean> memberIterator = mapOfMembers.values().iterator();
if (memberIterator != null) {
- List<String> listOfServer = new ArrayList<String>();
+ List<String> listOfServer = new ArrayList<>();
while (memberIterator.hasNext()) {
MemberMXBean bean = memberIterator.next();
if (bean.isCacheServer()) {
@@ -626,7 +625,7 @@ public class DistributedSystemBridge {
Iterator<MemberMXBean> memberIterator = mapOfMembers.values().iterator();
if (memberIterator != null) {
- List<String> listOfServer = new ArrayList<String>();
+ List<String> listOfServer = new ArrayList<>();
while (memberIterator.hasNext()) {
MemberMXBean bean = memberIterator.next();
if (bean.isServer()) {
@@ -657,10 +656,10 @@ public class DistributedSystemBridge {
/**
* @return a list of Gateway Senders
*/
- public String[] listGatwaySenders() {
+ public String[] listGatewaySenders() {
Iterator<GatewaySenderMXBean> gatewaySenderIterator = mapOfGatewaySenders.values().iterator();
if (gatewaySenderIterator != null) {
- List<String> listOfSenders = new ArrayList<String>();
+ List<String> listOfSenders = new ArrayList<>();
while (gatewaySenderIterator.hasNext()) {
listOfSenders.add(gatewaySenderIterator.next().getSenderId());
}
@@ -709,18 +708,15 @@ public class DistributedSystemBridge {
public String[] listLocators() {
if (cache != null) {
// each locator is a string of the form host[port] or bind-addr[port]
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
Map<InternalDistributedMember, Collection<String>> map =
cache.getDistributionManager().getAllHostedLocators();
for (Collection<String> hostedLocators : map.values()) {
- for (String locator : hostedLocators) {
- set.add(locator);
- }
+ set.addAll(hostedLocators);
}
- String[] locators = set.toArray(new String[set.size()]);
- return locators;
+ return set.toArray(new String[set.size()]);
}
return ManagementConstants.NO_DATA_STRING;
}
@@ -755,7 +751,7 @@ public class DistributedSystemBridge {
Iterator<MemberMXBean> memberIterator = mapOfMembers.values().iterator();
if (memberIterator != null) {
- Map<String, String[]> mapOfDisks = new HashMap<String, String[]>();
+ Map<String, String[]> mapOfDisks = new HashMap<>();
while (memberIterator.hasNext()) {
MemberMXBean bean = memberIterator.next();
mapOfDisks.put(bean.getMember(), bean.getDiskStores());
@@ -803,7 +799,7 @@ public class DistributedSystemBridge {
Iterator<MemberMXBean> memberIterator = mapOfMembers.values().iterator();
if (memberIterator != null) {
- Set<String> locatorMemberSet = new TreeSet<String>();
+ Set<String> locatorMemberSet = new TreeSet<>();
while (memberIterator.hasNext()) {
MemberMXBean memberMxBean = memberIterator.next();
if (memberMxBean.isLocator()) {
@@ -822,17 +818,17 @@ public class DistributedSystemBridge {
private String[] listStandAloneLocatorMembers() {
String[] locatorMembers = ManagementConstants.NO_DATA_STRING;
- Set<DistributedMember> members = new HashSet<DistributedMember>();
+ Set<DistributedMember> members = new HashSet<>();
members.add(system.getDistributedMember());
members.addAll(system.getAllOtherMembers());
if (!members.isEmpty()) {
- Set<String> locatorMemberSet = new TreeSet<String>();
+ Set<String> locatorMemberSet = new TreeSet<>();
for (DistributedMember member : members) {
if (DistributionManager.LOCATOR_DM_TYPE == ((InternalDistributedMember) member)
.getVmKind()) {
String name = member.getName();
- name = name != null && !name.trim().isEmpty() ? name : member.getId();
+ name = StringUtils.isNotBlank(name) ? name : member.getId();
locatorMemberSet.add(name);
}
}
@@ -852,7 +848,7 @@ public class DistributedSystemBridge {
Collection<MemberMXBean> values = mapOfMembers.values();
if (values != null) {
- Set<String> groupSet = new TreeSet<String>();
+ Set<String> groupSet = new TreeSet<>();
for (MemberMXBean memberMXBean : values) {
String[] memberGroups = memberMXBean.getGroups();
if (memberGroups != null && memberGroups.length != 0) {
@@ -878,7 +874,7 @@ public class DistributedSystemBridge {
/**
* @param member name or id of the member
- * @return basic Opertaing metrics for a given member.
+ * @return basic Operating metrics for a given member.
*/
public OSMetrics showOSMetrics(String member) throws Exception {
MemberMXBean bean = validateMember(member);
@@ -911,7 +907,7 @@ public class DistributedSystemBridge {
return ManagementConstants.NO_DATA_STRING;
}
// Sort region paths
- SortedSet<String> regionPathsSet = new TreeSet<String>();
+ SortedSet<String> regionPathsSet = new TreeSet<>();
for (DistributedRegionBridge bridge : distrRegionMap.values()) {
regionPathsSet.add(bridge.getFullPath());
}
@@ -933,9 +929,8 @@ public class DistributedSystemBridge {
Set<InternalDistributedMember> members = ShutdownAllRequest.send(dm, 0);
String[] shutDownMembers = new String[members.size()];
int j = 0;
- Iterator<InternalDistributedMember> it = members.iterator();
- while (it.hasNext()) {
- shutDownMembers[j] = it.next().getId();
+ for (InternalDistributedMember member : members) {
+ shutDownMembers[j] = member.getId();
j++;
}
return shutDownMembers;
@@ -949,16 +944,16 @@ public class DistributedSystemBridge {
* replicated region member are up and running so that the recovered data from the disk will be in
* sync;
*
- * @return Array of PeristentMemberDetails (which contains host, directory and disk store id)
+ * @return Array of PersistentMemberDetails (which contains host, directory and disk store id)
*/
public PersistentMemberDetails[] listMissingDiskStores() {
PersistentMemberDetails[] missingDiskStores = null;
- Set<PersistentID> persitentMemberSet = MissingPersistentIDsRequest.send(dm);
- if (persitentMemberSet != null && persitentMemberSet.size() > 0) {
- missingDiskStores = new PersistentMemberDetails[persitentMemberSet.size()];
+ Set<PersistentID> persistentMemberSet = MissingPersistentIDsRequest.send(dm);
+ if (persistentMemberSet != null && persistentMemberSet.size() > 0) {
+ missingDiskStores = new PersistentMemberDetails[persistentMemberSet.size()];
int j = 0;
- for (PersistentID id : persitentMemberSet) {
+ for (PersistentID id : persistentMemberSet) {
missingDiskStores[j] = new PersistentMemberDetails(id.getHost().getCanonicalHostName(),
id.getDirectory(), id.getUUID().toString());
j++;
@@ -974,7 +969,7 @@ public class DistributedSystemBridge {
* @param diskStoreId UUID of the disk store to revoke
* @return successful or failure
*/
- public boolean revokeMissingDiskStores(final String diskStoreId) throws Exception {
+ public boolean revokeMissingDiskStores(final String diskStoreId) {
// make sure that the disk store we're revoking is actually missing
boolean found = false;
PersistentMemberDetails[] details = listMissingDiskStores();
@@ -1018,8 +1013,7 @@ public class DistributedSystemBridge {
public ObjectName fetchMemberObjectName(String member) throws Exception {
validateMember(member);
- ObjectName memberName = MBeanJMXAdapter.getMemberMBeanName(member);
- return memberName;
+ return MBeanJMXAdapter.getMemberMBeanName(member);
}
public ObjectName[] listMemberObjectNames() {
@@ -1062,7 +1056,7 @@ public class DistributedSystemBridge {
}
public ObjectName[] fetchRegionObjectNames(ObjectName memberMBeanName) throws Exception {
- List<ObjectName> list = new ArrayList<ObjectName>();
+ List<ObjectName> list = new ArrayList<>();
if (mapOfMembers.get(memberMBeanName) != null) {
MemberMXBean bean = mapOfMembers.get(memberMBeanName);
String member =
@@ -1080,11 +1074,8 @@ public class DistributedSystemBridge {
}
public ObjectName[] listDistributedRegionObjectNames() {
- List<ObjectName> list = new ArrayList<ObjectName>();
- Iterator<ObjectName> it = distrRegionMap.keySet().iterator();
- while (it.hasNext()) {
- list.add(it.next());
- }
+ List<ObjectName> list = new ArrayList<>();
+ list.addAll(distrRegionMap.keySet());
ObjectName[] objNames = new ObjectName[list.size()];
return list.toArray(objNames);
}
@@ -1127,8 +1118,7 @@ public class DistributedSystemBridge {
public ObjectName fetchDistributedLockServiceObjectName(String lockServiceName) throws Exception {
DistributedLockServiceMXBean bean = service.getDistributedLockServiceMXBean(lockServiceName);
if (bean != null) {
- ObjectName lockSerName = service.getDistributedLockServiceMBeanName(lockServiceName);
- return lockSerName;
+ return service.getDistributedLockServiceMBeanName(lockServiceName);
} else {
throw new Exception(
ManagementStrings.DISTRIBUTED_LOCK_SERVICE_MBEAN_NOT_FOUND_IN_SYSTEM.toString());
@@ -1217,7 +1207,7 @@ public class DistributedSystemBridge {
Set<ObjectName> mbeanSet = service.queryMBeanNames(distributedMember);
if (mbeanSet != null && mbeanSet.size() > 0) {
- listName = new ArrayList<ObjectName>();
+ listName = new ArrayList<>();
for (ObjectName name : mbeanSet) {
if (pattern.apply(name)) {
listName.add(name);
@@ -1226,8 +1216,8 @@ public class DistributedSystemBridge {
}
if (listName != null && listName.size() > 0) {
- ObjectName[] arry = new ObjectName[listName.size()];
- return listName.toArray(arry);
+ ObjectName[] array = new ObjectName[listName.size()];
+ return listName.toArray(array);
}
return ManagementConstants.NO_DATA_OBJECTNAME;
}
@@ -1240,21 +1230,18 @@ public class DistributedSystemBridge {
*/
public int getNumClients() {
if (mapOfServers.keySet().size() > 0) {
- Set<String> uniqueClientSet = new HashSet<String>();
- Iterator<CacheServerMXBean> it = mapOfServers.values().iterator();
- while (it.hasNext()) {
- String[] clients = null;
+ Set<String> uniqueClientSet = new HashSet<>();
+ for (CacheServerMXBean cacheServerMXBean : mapOfServers.values()) {
+ String[] clients;
try {
- clients = it.next().getClientIds();
+ clients = cacheServerMXBean.getClientIds();
} catch (Exception e) {
// Mostly due to condition where member is departed and proxy is still
// with Manager.
clients = null;
}
if (clients != null) {
- for (String client : clients) {
- uniqueClientSet.add(client);
- }
+ Collections.addAll(uniqueClientSet, clients);
}
}
return uniqueClientSet.size();
@@ -1477,10 +1464,8 @@ public class DistributedSystemBridge {
public Map<String, Boolean> viewRemoteClusterStatus() {
if (mapOfGatewaySenders.values().size() > 0) {
- Map<String, Boolean> senderMap = new HashMap<String, Boolean>();
- Iterator<GatewaySenderMXBean> it = mapOfGatewaySenders.values().iterator();
- while (it.hasNext()) {
- GatewaySenderMXBean bean = it.next();
+ Map<String, Boolean> senderMap = new HashMap<>();
+ for (GatewaySenderMXBean bean : mapOfGatewaySenders.values()) {
Integer dsId = bean.getRemoteDSId();
if (dsId != null) {
senderMap.merge(dsId.toString(), bean.isRunning(), Boolean::logicalAnd);
@@ -1548,10 +1533,10 @@ public class DistributedSystemBridge {
synchronized (distrRegionMap) {
DistributedRegionBridge bridge = distrRegionMap.get(distributedRegionObjectName);
if (bridge != null) {
- FederationComponent newObj = (FederationComponent) (fedComp);
+ FederationComponent newObj = fedComp;
bridge.addProxyToMap(proxyName, regionProxy, newObj);
} else {
- FederationComponent newObj = (FederationComponent) (fedComp);
+ FederationComponent newObj = fedComp;
bridge = new DistributedRegionBridge(proxyName, regionProxy, newObj);
DistributedRegionMXBean mbean = new DistributedRegionMBean(bridge);
@@ -1591,10 +1576,10 @@ public class DistributedSystemBridge {
DistributedRegionBridge bridge = distrRegionMap.get(distributedRegionObjectName);
if (bridge != null) {
- FederationComponent newProxy = (FederationComponent) (newValue);
+ FederationComponent newProxy = newValue;
FederationComponent oldProxy = null;
if (oldValue != null) {
- oldProxy = (FederationComponent) oldValue;
+ oldProxy = oldValue;
}
bridge.updateRegion(newProxy, oldProxy);
}
@@ -1651,7 +1636,7 @@ public class DistributedSystemBridge {
FederationComponent newValue) {
// No body is calling this method right now.
// If aggregate stats are added in Distributed Lock Service it will be
- // neeeded.
+ // needed.
}
public void memberDeparted(InternalDistributedMember id, boolean crashed) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemMBean.java
index a87b366..c45da73 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemMBean.java
@@ -14,11 +14,6 @@
*/
package org.apache.geode.management.internal.beans;
-import java.util.Map;
-
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.ObjectName;
-
import org.apache.geode.management.DiskBackupStatus;
import org.apache.geode.management.DiskMetrics;
import org.apache.geode.management.DistributedSystemMXBean;
@@ -28,6 +23,10 @@ import org.apache.geode.management.NetworkMetrics;
import org.apache.geode.management.OSMetrics;
import org.apache.geode.management.PersistentMemberDetails;
+import java.util.Map;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.ObjectName;
+
/**
* Distributed System MBean
*
@@ -103,7 +102,7 @@ public class DistributedSystemMBean extends NotificationBroadcasterSupport
@Override
public String[] listGatewaySenders() {
- return bridge.listGatwaySenders();
+ return bridge.listGatewaySenders();
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
index 7dce602..003a8f3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
@@ -14,26 +14,7 @@
*/
package org.apache.geode.management.internal.beans;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-
-import org.apache.geode.distributed.internal.DistributionManager;
-import org.apache.geode.internal.cache.CacheService;
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
@@ -42,11 +23,13 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.ClassLoadUtil;
+import org.apache.geode.internal.cache.CacheService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
@@ -75,6 +58,21 @@ import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
import org.apache.geode.management.membership.ClientMembershipListenerAdapter;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
+import org.apache.logging.log4j.Logger;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.Notification;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
/**
* Acts as an intermediate between MBean layer and Federation Layer. Handles all Call backs from
@@ -111,9 +109,9 @@ public class ManagementAdapter {
private MBeanAggregator aggregator;
- public static final List<Class> refreshOnInit = new ArrayList<Class>();
+ public static final List<Class> refreshOnInit = new ArrayList<>();
- public static final List<String> internalLocks = new ArrayList<String>();
+ public static final List<String> internalLocks = new ArrayList<>();
static {
refreshOnInit.add(RegionMXBean.class);
@@ -219,9 +217,7 @@ public class ManagementAdapter {
service.afterCreateProxy(memberObjectName, MemberMXBean.class, localMember, addedComp);
- Iterator<ObjectName> it = registeredMBeans.keySet().iterator();
- while (it.hasNext()) {
- ObjectName objectName = it.next();
+ for (ObjectName objectName : registeredMBeans.keySet()) {
if (objectName.equals(memberObjectName)) {
continue;
}
@@ -235,8 +231,8 @@ public class ManagementAdapter {
FederationComponent newObj = service.getLocalManager().getFedComponents().get(objectName);
- for (int i = 0; i < intfTyps.length; i++) {
- Class intfTyp = (Class) intfTyps[i];
+ for (Type intfTyp1 : intfTyps) {
+ Class intfTyp = (Class) intfTyp1;
service.afterCreateProxy(objectName, intfTyp, object, newObj);
}
@@ -265,12 +261,10 @@ public class ManagementAdapter {
MBeanJMXAdapter jmxAdapter = service.getJMXAdapter();
Map<ObjectName, Object> registeredMBeans = jmxAdapter.getLocalGemFireMBean();
- ObjectName aggregatemMBeanPattern = null;
+ ObjectName aggregatemMBeanPattern;
try {
aggregatemMBeanPattern = new ObjectName(ManagementConstants.AGGREGATE_MBEAN_PATTERN);
- } catch (MalformedObjectNameException e1) {
- throw new ManagementException(e1);
- } catch (NullPointerException e1) {
+ } catch (MalformedObjectNameException | NullPointerException e1) {
throw new ManagementException(e1);
}
@@ -284,10 +278,7 @@ public class ManagementAdapter {
service.afterRemoveProxy(memberObjectName, MemberMXBean.class, localMember, removedComp);
- Iterator<ObjectName> it = registeredMBeans.keySet().iterator();
-
- while (it.hasNext()) {
- ObjectName objectName = it.next();
+ for (ObjectName objectName : registeredMBeans.keySet()) {
if (objectName.equals(memberObjectName)) {
continue;
}
@@ -304,14 +295,11 @@ public class ManagementAdapter {
FederationComponent oldObj = service.getLocalManager().getFedComponents().get(objectName);
- for (int i = 0; i < intfTyps.length; i++) {
- Class intfTyp = (Class) intfTyps[i];
+ for (Type intfTyp1 : intfTyps) {
+ Class intfTyp = (Class) intfTyp1;
service.afterRemoveProxy(objectName, intfTyp, object, oldObj);
}
- } catch (InstanceNotFoundException e) {
- logger.warn("Failed to invoke aggregator for {} with exception {}", objectName,
- e.getMessage(), e);
- } catch (ClassNotFoundException e) {
+ } catch (InstanceNotFoundException | ClassNotFoundException e) {
logger.warn("Failed to invoke aggregator for {} with exception {}", objectName,
e.getMessage(), e);
}
@@ -359,7 +347,7 @@ public class ManagementAdapter {
// Bridge is responsible for extracting data from GemFire Layer
RegionMBeanBridge<K, V> bridge = RegionMBeanBridge.getInstance(region);
- RegionMXBean regionMBean = new RegionMBean<K, V>(bridge);
+ RegionMXBean regionMBean = new RegionMBean<>(bridge);
ObjectName regionMBeanName = MBeanJMXAdapter.getRegionMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), region.getFullPath());
ObjectName changedMBeanName = service.registerInternalMBean(regionMBean, regionMBeanName);
@@ -567,7 +555,7 @@ public class ManagementAdapter {
ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsycnEventQueueMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), queue.getId());
- AsyncEventQueueMBean bean = null;
+ AsyncEventQueueMBean bean;
try {
bean = (AsyncEventQueueMBean) service.getLocalAsyncEventQueueMXBean(queue.getId());
if (bean == null) {
@@ -616,7 +604,7 @@ public class ManagementAdapter {
}
private Map<String, String> prepareUserData(AlertDetails details) {
- Map<String, String> userData = new HashMap<String, String>();
+ Map<String, String> userData = new HashMap<>();
userData.put(JMXNotificationUserData.ALERT_LEVEL,
AlertDetails.getAlertLevelAsString(details.getAlertLevel()));
@@ -627,7 +615,7 @@ public class ManagementAdapter {
String nameOrId = memberSource; // TODO: what if sender is null?
if (sender != null) {
nameOrId = sender.getName();
- nameOrId = nameOrId != null && !nameOrId.trim().isEmpty() ? nameOrId : sender.getId();
+ nameOrId = StringUtils.isNotBlank(nameOrId) ? nameOrId : sender.getId();
}
userData.put(JMXNotificationUserData.MEMBER, nameOrId);
@@ -799,7 +787,7 @@ public class ManagementAdapter {
synchronized (regionOpLock) {
ObjectName regionMBeanName = MBeanJMXAdapter.getRegionMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), region.getFullPath());
- RegionMBean bean = null;
+ RegionMBean bean;
try {
bean = (RegionMBean) service.getLocalRegionMBean(region.getFullPath());
} catch (ManagementException e) {
@@ -838,7 +826,7 @@ public class ManagementAdapter {
ObjectName diskStoreMBeanName = MBeanJMXAdapter.getDiskStoreMBeanName(
internalCache.getDistributedSystem().getDistributedMember(), disk.getName());
- DiskStoreMBean bean = null;
+ DiskStoreMBean bean;
try {
bean = (DiskStoreMBean) service.getLocalDiskStoreMBean(disk.getName());
if (bean == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
index f701d29..9829df3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
@@ -14,21 +14,7 @@
*/
package org.apache.geode.management.internal.beans;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -64,6 +50,19 @@ import org.apache.geode.management.internal.cli.commands.DataCommands;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.json.TypedJson;
+import org.apache.logging.log4j.Logger;
+
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* This function is executed on one or multiple members based on the member input to
@@ -128,7 +127,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
final boolean showMember, final String regionName, final int limit,
final int queryResultSetLimit, final int queryCollectionsDepth) throws Exception {
InternalCache cache = getCache();
- Function loclQueryFunc = new LocalQueryFunction("LocalQueryFunction", regionName, showMember)
+ Function localQueryFunc = new LocalQueryFunction("LocalQueryFunction", regionName, showMember)
.setOptimizeForWrite(true);
queryString = applyLimitClause(queryString, limit, queryResultSetLimit);
@@ -154,7 +153,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
results = query.execute();
} else {
- ResultCollector rcollector = null;
+ ResultCollector rcollector;
PartitionedRegion parRegion =
PartitionedRegionHelper.getPartitionedRegion(regionName, cache);
@@ -169,13 +168,11 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
LocalDataSet lds = new LocalDataSet(parRegion, localPrimaryBucketSet);
DefaultQuery query = (DefaultQuery) cache.getQueryService().newQuery(queryString);
- SelectResults selectResults =
- (SelectResults) lds.executeQuery(query, null, localPrimaryBucketSet);
- results = selectResults;
+ results = (SelectResults) lds.executeQuery(query, null, localPrimaryBucketSet);
}
} else {
rcollector = FunctionService.onRegion(cache.getRegion(regionName))
- .setArguments(queryString).execute(loclQueryFunc);
+ .setArguments(queryString).execute(localQueryFunc);
results = rcollector.getResult();
}
}
@@ -183,8 +180,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
if (results != null && results instanceof SelectResults) {
SelectResults selectResults = (SelectResults) results;
- for (Iterator iter = selectResults.iterator(); iter.hasNext();) {
- Object object = iter.next();
+ for (Object object : selectResults) {
result.add(RESULT_KEY, object);
noDataFound = false;
}
@@ -203,7 +199,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
if (noDataFound) {
return new QueryDataFunctionResult(QUERY_EXEC_SUCCESS,
- BeanUtilFuncs.compress(new JsonisedErroMessage(NO_DATA_FOUND).toString()));
+ BeanUtilFuncs.compress(new JsonisedErrorMessage(NO_DATA_FOUND).toString()));
}
return new QueryDataFunctionResult(QUERY_EXEC_SUCCESS,
BeanUtilFuncs.compress(result.toString()));
@@ -272,7 +268,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
// member.
// Note , if no member is selected this is the code path executed. A
// random associated member is chosen.
- List<String> decompressedList = new ArrayList<String>();
+ List<String> decompressedList = new ArrayList<>();
decompressedList.add(BeanUtilFuncs.decompress(result.compressedBytes));
return wrapResult(decompressedList.toString());
}
@@ -290,10 +286,10 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
Iterator<QueryDataFunctionResult> it = list.iterator();
- List<String> decompressedList = new ArrayList<String>();
+ List<String> decompressedList = new ArrayList<>();
while (it.hasNext()) {
- String decompressedStr = null;
+ String decompressedStr;
decompressedStr = BeanUtilFuncs.decompress(it.next().compressedBytes);
decompressedList.add(decompressedStr);
}
@@ -308,12 +304,6 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
} catch (FunctionException fe) {
throw new Exception(
ManagementStrings.QUERY__MSG__QUERY_EXEC.toLocalizedString(fe.getMessage()));
- } catch (IOException e) {
- throw new Exception(
- ManagementStrings.QUERY__MSG__QUERY_EXEC.toLocalizedString(e.getMessage()));
- } catch (Exception e) {
- throw new Exception(
- ManagementStrings.QUERY__MSG__QUERY_EXEC.toLocalizedString(e.getMessage()));
} catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
throw e;
@@ -339,20 +329,20 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
throws Exception {
if (query == null || query.isEmpty()) {
- return new JsonisedErroMessage(ManagementStrings.QUERY__MSG__QUERY_EMPTY.toLocalizedString())
+ return new JsonisedErrorMessage(ManagementStrings.QUERY__MSG__QUERY_EMPTY.toLocalizedString())
.toString();
}
Set<DistributedMember> inputMembers = null;
- if (members != null && !members.trim().isEmpty()) {
- inputMembers = new HashSet<DistributedMember>();
+ if (StringUtils.isNotBlank(members)) {
+ inputMembers = new HashSet<>();
StringTokenizer st = new StringTokenizer(members, ",");
while (st.hasMoreTokens()) {
String member = st.nextToken();
DistributedMember distributedMember = BeanUtilFuncs.getDistributedMemberByNameOrId(member);
inputMembers.add(distributedMember);
if (distributedMember == null) {
- return new JsonisedErroMessage(
+ return new JsonisedErrorMessage(
ManagementStrings.QUERY__MSG__INVALID_MEMBER.toLocalizedString(member)).toString();
}
}
@@ -370,7 +360,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
for (String regionPath : regionsInQuery) {
DistributedRegionMXBean regionMBean = service.getDistributedRegionMXBean(regionPath);
if (regionMBean == null) {
- return new JsonisedErroMessage(
+ return new JsonisedErrorMessage(
ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND.toLocalizedString(regionPath))
.toString();
} else {
@@ -379,7 +369,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
if (inputMembers != null && inputMembers.size() > 0) {
if (!associatedMembers.containsAll(inputMembers)) {
- return new JsonisedErroMessage(
+ return new JsonisedErrorMessage(
ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND_ON_MEMBERS
.toLocalizedString(regionPath)).toString();
}
@@ -387,7 +377,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
}
} else {
- return new JsonisedErroMessage(ManagementStrings.QUERY__MSG__INVALID_QUERY
+ return new JsonisedErrorMessage(ManagementStrings.QUERY__MSG__INVALID_QUERY
.toLocalizedString("Region mentioned in query probably missing /")).toString();
}
@@ -398,7 +388,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
if (regionMBean.getRegionType().equals(DataPolicy.PARTITION.toString())
|| regionMBean.getRegionType().equals(DataPolicy.PERSISTENT_PARTITION.toString())) {
- return new JsonisedErroMessage(
+ return new JsonisedErrorMessage(
ManagementStrings.QUERY__MSG__JOIN_OP_EX.toLocalizedString()).toString();
}
}
@@ -422,8 +412,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
functionArgs[LIMIT] = limit;
functionArgs[QUERY_RESULTSET_LIMIT] = queryResultSetLimit;
functionArgs[QUERY_COLLECTIONS_DEPTH] = queryCollectionsDepth;
- Object result = callFunction(functionArgs, inputMembers, zipResult);
- return result;
+ return callFunction(functionArgs, inputMembers, zipResult);
} else { // Query on any random member
functionArgs[DISPLAY_MEMBERWISE] = false;
functionArgs[QUERY] = query;
@@ -431,17 +420,16 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
functionArgs[LIMIT] = limit;
functionArgs[QUERY_RESULTSET_LIMIT] = queryResultSetLimit;
functionArgs[QUERY_COLLECTIONS_DEPTH] = queryCollectionsDepth;
- Object result = callFunction(functionArgs, associatedMembers, zipResult);
- return result;
+ return callFunction(functionArgs, associatedMembers, zipResult);
}
} else {
- return new JsonisedErroMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND
+ return new JsonisedErrorMessage(ManagementStrings.QUERY__MSG__REGIONS_NOT_FOUND
.toLocalizedString(regionsInQuery.toString())).toString();
}
} catch (QueryInvalidException qe) {
- return new JsonisedErroMessage(
+ return new JsonisedErrorMessage(
ManagementStrings.QUERY__MSG__INVALID_QUERY.toLocalizedString(qe.getMessage()))
.toString();
}
@@ -451,13 +439,13 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
return (InternalCache) CacheFactory.getAnyInstance();
}
- private static class JsonisedErroMessage {
+ private static class JsonisedErrorMessage {
private static String message = "message";
private GfJsonObject gFJsonObject = new GfJsonObject();
- public JsonisedErroMessage(final String errorMessage) throws Exception {
+ public JsonisedErrorMessage(final String errorMessage) throws Exception {
try {
gFJsonObject.put(message, errorMessage);
} catch (GfJsonException e) {
@@ -483,10 +471,10 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
private static Set<String> compileQuery(final InternalCache cache, final String query)
throws QueryInvalidException {
QCompiler compiler = new QCompiler();
- Set<String> regionsInQuery = null;
+ Set<String> regionsInQuery;
try {
CompiledValue compiledQuery = compiler.compileQuery(query);
- Set<String> regions = new HashSet<String>();
+ Set<String> regions = new HashSet<>();
compiledQuery.getRegionsInQuery(regions, null);
regionsInQuery = Collections.unmodifiableSet(regions);
return regionsInQuery;
[23/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
index 0f4ec6d..1a50d0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java
@@ -15,46 +15,73 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
-// stats: STATS
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOffHeap {
public VMStatsLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -62,6 +89,7 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -92,13 +120,19 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -114,7 +148,9 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -138,7 +174,7 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -149,117 +185,121 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -269,7 +309,7 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -279,13 +319,14 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsLRURegionEntryOffHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsLRURegionEntryOffHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -294,12 +335,12 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -312,14 +353,15 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -331,13 +373,17 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -350,5 +396,8 @@ public class VMStatsLRURegionEntryOffHeapUUIDKey extends VMStatsLRURegionEntryOf
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java
index 8f9650e..6671d74 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java
@@ -15,36 +15,62 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VMStatsRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -52,10 +78,11 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -75,7 +102,7 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -86,21 +113,24 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -110,7 +140,7 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -120,13 +150,14 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -135,12 +166,12 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -153,14 +184,15 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -172,12 +204,18 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -188,5 +226,8 @@ public class VMStatsRegionEntryHeapIntKey extends VMStatsRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java
index e6311d2..1ce3cc1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java
@@ -15,36 +15,62 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VMStatsRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -52,10 +78,11 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -75,7 +102,7 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -86,21 +113,24 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -110,7 +140,7 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -120,13 +150,14 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -135,12 +166,12 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -153,14 +184,15 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -172,12 +204,16 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -188,5 +224,8 @@ public class VMStatsRegionEntryHeapLongKey extends VMStatsRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java
index 28f2ff7..7bb1a29 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java
@@ -15,36 +15,62 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, value);
+ public VMStatsRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -52,10 +78,11 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -75,7 +102,7 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -86,21 +113,24 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -110,7 +140,7 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -120,13 +150,14 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapObjectKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapObjectKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapObjectKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -135,12 +166,12 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -153,14 +184,15 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -172,13 +204,20 @@ public class VMStatsRegionEntryHeapObjectKey extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java
index e3485a9..c4d8601 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java
@@ -15,15 +15,21 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -31,17 +37,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMStatsRegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -60,9 +81,11 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -70,10 +93,11 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -93,7 +117,7 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -104,21 +128,24 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -128,7 +155,7 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -138,13 +165,14 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey1.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapStringKey1> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey1.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -153,12 +181,12 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -171,14 +199,15 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -190,8 +219,12 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -205,7 +238,7 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -224,6 +257,7 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -253,5 +287,8 @@ public class VMStatsRegionEntryHeapStringKey1 extends VMStatsRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java
index 63a0908..c503d17 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java
@@ -15,15 +15,21 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -32,16 +38,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMStatsRegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -72,9 +93,11 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -82,10 +105,11 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -105,7 +129,7 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -116,21 +140,24 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -140,7 +167,7 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -150,13 +177,14 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey2.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapStringKey2> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapStringKey2.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -165,12 +193,12 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -183,14 +211,15 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -202,8 +231,12 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -222,7 +255,7 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -252,6 +285,7 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -294,5 +328,7 @@ public class VMStatsRegionEntryHeapStringKey2 extends VMStatsRegionEntryHeap {
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
index 829d16e..1eb556e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java
@@ -15,38 +15,63 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
- public VMStatsRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VMStatsRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -54,10 +79,11 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -77,7 +103,7 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -88,21 +114,24 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -112,7 +141,7 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -122,13 +151,14 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -137,12 +167,12 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -155,14 +185,15 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -174,13 +205,17 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -193,5 +228,8 @@ public class VMStatsRegionEntryHeapUUIDKey extends VMStatsRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
index da05e2d..52a6a75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java
@@ -15,41 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,6 +83,7 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -87,13 +114,19 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -109,7 +142,9 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -133,7 +168,7 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -144,21 +179,24 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -168,7 +206,7 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -178,13 +216,14 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -193,12 +232,12 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -211,14 +250,15 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -230,12 +270,18 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -246,5 +292,8 @@ public class VMStatsRegionEntryOffHeapIntKey extends VMStatsRegionEntryOffHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
index 5caaa68..bd8ff31 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java
@@ -15,41 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,6 +83,7 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -87,13 +114,19 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -109,7 +142,9 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -133,7 +168,7 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -144,21 +179,24 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -168,7 +206,7 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -178,13 +216,14 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -193,12 +232,12 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -211,14 +250,15 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -230,12 +270,16 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -246,5 +290,8 @@ public class VMStatsRegionEntryOffHeapLongKey extends VMStatsRegionEntryOffHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
index 8821a7b..647f663 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java
@@ -15,41 +15,67 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,6 +83,7 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapObjectKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -87,13 +114,19 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -109,7 +142,9 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -133,7 +168,7 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -144,21 +179,24 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -168,7 +206,7 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -178,13 +216,14 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapObjectKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapObjectKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapObjectKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -193,12 +232,12 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -211,14 +250,15 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -230,13 +270,20 @@ public class VMStatsRegionEntryOffHeapObjectKey extends VMStatsRegionEntryOffHea
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
index 164454b..c73df3a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java
@@ -15,37 +15,59 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -64,9 +86,11 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -74,6 +98,7 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey1.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -104,13 +129,19 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -126,7 +157,9 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -150,7 +183,7 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -161,21 +194,24 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -185,7 +221,7 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -195,13 +231,14 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey1.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapStringKey1> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey1.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -210,12 +247,12 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -228,14 +265,15 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -247,8 +285,12 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -262,7 +304,7 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -281,6 +323,7 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -310,5 +353,8 @@ public class VMStatsRegionEntryOffHeapStringKey1 extends VMStatsRegionEntryOffHe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[09/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
index 7ab81f8..bf9380c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRegionEntryHeap {
public VersionedThinDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -62,10 +91,11 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -85,7 +115,7 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -96,19 +126,22 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -118,7 +151,9 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -143,7 +178,6 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -183,7 +217,11 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -200,6 +238,7 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -217,6 +256,7 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -246,6 +286,7 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -278,13 +319,16 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -297,5 +341,8 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
index 1d0bdc9..cdfd226 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
@@ -15,47 +15,76 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -64,6 +93,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -95,13 +125,19 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -117,7 +153,9 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -141,7 +179,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -152,19 +190,22 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -174,7 +215,9 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -199,7 +242,6 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -239,7 +281,11 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -256,6 +302,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -273,6 +320,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -302,6 +350,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -334,12 +383,17 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -350,5 +404,8 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
index 324134a..7ef2d5f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
@@ -15,33 +15,43 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,14 +59,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskRegionEntryOffHeapLongKey
extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -65,6 +94,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -96,13 +126,19 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -118,7 +154,9 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -142,7 +180,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -153,19 +191,22 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -175,7 +216,9 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -200,7 +243,6 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -240,7 +282,11 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -257,6 +303,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -274,6 +321,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -303,6 +351,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -335,12 +384,15 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -351,5 +403,8 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
index 77048f7..9f0055e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
@@ -15,33 +15,43 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,14 +59,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskRegionEntryOffHeapObjectKey
extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -65,6 +93,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -96,13 +125,19 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -118,7 +153,9 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -142,7 +179,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -153,19 +190,22 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -175,7 +215,9 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -200,7 +242,6 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -240,7 +281,11 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -257,6 +302,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -274,6 +320,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -303,6 +350,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -335,13 +383,19 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
index c2b9845..34b5e68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
@@ -15,33 +15,43 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,10 +59,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskRegionEntryOffHeapStringKey1
extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -71,9 +96,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -82,6 +109,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -113,13 +141,19 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -135,7 +169,9 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -159,7 +195,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -170,19 +206,22 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -192,7 +231,9 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -217,7 +258,6 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -257,7 +297,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -274,6 +318,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -291,6 +336,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -320,6 +366,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -352,8 +399,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -367,7 +417,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -386,6 +436,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -415,5 +466,8 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
index 0e3a75c..1fd7871 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
@@ -15,33 +15,43 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -49,10 +59,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskRegionEntryOffHeapStringKey2
extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -83,9 +108,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -94,6 +121,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -125,13 +153,19 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -147,7 +181,9 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -171,7 +207,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -182,19 +218,22 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -204,7 +243,9 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -229,7 +270,6 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -269,7 +309,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -286,6 +330,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -303,6 +348,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -332,6 +378,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -364,8 +411,11 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -384,7 +434,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -414,6 +464,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -456,5 +507,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
index 751e8dd..59ab436 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
@@ -15,34 +15,45 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -50,15 +61,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskRegionEntryOffHeapUUIDKey
extends VersionedThinDiskRegionEntryOffHeap {
public VersionedThinDiskRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -67,6 +97,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +129,19 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +157,9 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +183,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,19 +194,22 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -177,7 +219,9 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -202,7 +246,6 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -242,7 +285,11 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -259,6 +306,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -276,6 +324,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -305,6 +354,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -337,13 +387,16 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -356,5 +409,8 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapIntKey.java
index 8d4d2b0..79520c1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapIntKey.java
@@ -15,43 +15,72 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegionEntryHeap {
- public VersionedThinLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VersionedThinLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -60,10 +89,11 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -83,7 +113,7 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -94,114 +124,118 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -218,6 +252,7 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -235,6 +270,7 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -264,6 +300,7 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -296,12 +333,17 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -312,5 +354,8 @@ public class VersionedThinLRURegionEntryHeapIntKey extends VersionedThinLRURegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapLongKey.java
index b552bf9..3f8145e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapLongKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegionEntryHeap {
public VersionedThinLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,10 +89,11 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -84,7 +113,7 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -95,114 +124,118 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -219,6 +252,7 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -236,6 +270,7 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -265,6 +300,7 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -297,12 +333,15 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -313,5 +352,8 @@ public class VersionedThinLRURegionEntryHeapLongKey extends VersionedThinLRURegi
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapObjectKey.java
index 316418c..e30c9c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapObjectKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURegionEntryHeap {
public VersionedThinLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,10 +89,11 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -84,7 +113,7 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -95,114 +124,118 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -219,6 +252,7 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -236,6 +270,7 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -265,6 +300,7 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -297,13 +333,19 @@ public class VersionedThinLRURegionEntryHeapObjectKey extends VersionedThinLRURe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[44/69] [abbrv] geode git commit: GEODE-2587: Refactored the
OrderByComparator's compare method
Posted by ud...@apache.org.
GEODE-2587: Refactored the OrderByComparator's compare method
* This prevents creation of extra data structures like arrays of arrays
* Hence let number of GC, faster execution of queries with ORDER BY
This closes #517
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b3fc0c81
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b3fc0c81
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b3fc0c81
Branch: refs/heads/feature/GEODE-2580
Commit: b3fc0c814948cdfeb3181fcb57d07886aba8691e
Parents: 52dadee
Author: nabarunnag <na...@cs.wisc.edu>
Authored: Sun May 14 22:19:26 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Wed May 17 16:49:31 2017 -0700
----------------------------------------------------------------------
.../cache/query/internal/OrderByComparator.java | 212 ++++++++++---------
.../internal/OrderByComparatorUnmapped.java | 60 ++++++
2 files changed, 170 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/b3fc0c81/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
index 3fdb11b..59eb493 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java
@@ -71,6 +71,60 @@ public class OrderByComparator implements Comparator {
return array;
}
+ protected int evaluateSortCriteria(Object value1, Object value2) {
+ int result = -1;
+ CompiledSortCriterion csc;
+ if (orderByAttrs != null) {
+ Iterator orderiter = orderByAttrs.iterator();
+ while (orderiter.hasNext()) {
+ csc = (CompiledSortCriterion) orderiter.next();
+ Object sortCriteriaForValue1 = csc.evaluate(value1, context);
+ Object sortCriteriaForValue2 = csc.evaluate(value2, context);
+
+ if (sortCriteriaForValue1 == null || sortCriteriaForValue2 == null) {
+ if (sortCriteriaForValue1 == null) {
+ result = (sortCriteriaForValue2 == null ? 0 : -1);
+ } else {
+ result = 1;
+ }
+ } else if (sortCriteriaForValue1 == QueryService.UNDEFINED
+ || sortCriteriaForValue2 == QueryService.UNDEFINED) {
+ if (sortCriteriaForValue1 == QueryService.UNDEFINED) {
+ result = (sortCriteriaForValue2 == QueryService.UNDEFINED ? 0 : -1);
+ } else {
+ result = 1;
+ }
+ } else {
+ if (sortCriteriaForValue1 instanceof Number && sortCriteriaForValue2 instanceof Number) {
+ double diff = ((Number) sortCriteriaForValue1).doubleValue()
+ - ((Number) sortCriteriaForValue2).doubleValue();
+ result = diff > 0 ? 1 : diff < 0 ? -1 : 0;
+ } else {
+ if (sortCriteriaForValue1 instanceof PdxString
+ && sortCriteriaForValue2 instanceof String) {
+ sortCriteriaForValue2 = new PdxString((String) sortCriteriaForValue2);
+ } else if (sortCriteriaForValue2 instanceof PdxString
+ && sortCriteriaForValue1 instanceof String) {
+ sortCriteriaForValue1 = new PdxString((String) sortCriteriaForValue1);
+ }
+ result = ((Comparable) sortCriteriaForValue1).compareTo(sortCriteriaForValue2);
+ }
+
+ }
+
+ if (result == 0) {
+ continue;
+ } else {
+ if (Boolean.valueOf(csc.getCriterion())) {
+ result = (result * (-1));
+ }
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
/**
* Compares its two arguments for order. Returns a negative integer, zero, or a positive integer
* as the first argument is less than, equal to, or greater than the second.
@@ -92,122 +146,76 @@ public class OrderByComparator implements Comparator {
if ((this.objType.isStructType() && obj1 instanceof Object[] && obj2 instanceof Object[])
|| !this.objType.isStructType()) { // obj1 instanceof Object && obj2
// instanceof Object){
- Object[] list1 = this.evaluateSortCriteria(obj1);
- Object[] list2 = this.evaluateSortCriteria(obj2);
+ if ((result = evaluateSortCriteria(obj1, obj2)) != 0) {
+ return result;
+ }
- if (list1.length != list2.length) {
- Support.assertionFailed("Error Occurred due to improper sort criteria evaluation ");
- } else {
- for (int i = 0; i < list1.length; i++) {
- Object arr1[] = (Object[]) list1[i];
- Object arr2[] = (Object[]) list2[i];
- // check for null.
- if (arr1[0] == null || arr2[0] == null) {
- if (arr1[0] == null) {
- result = (arr2[0] == null ? 0 : -1);
+ QueryObserver observer = QueryObserverHolder.getInstance();
+ if (observer != null) {
+ observer.orderByColumnsEqual();
+ }
+ // The comparable fields are equal, so we check if the overall keys are
+ // equal or not
+ if (this.objType.isStructType()) {
+ int i = 0;
+ for (Object o1 : (Object[]) obj1) {
+ Object o2 = ((Object[]) obj2)[i++];
+
+ // Check for null value.
+ if (o1 == null || o2 == null) {
+ if (o1 == null) {
+ if (o2 == null) {
+ continue;
+ }
+ return -1;
} else {
- result = 1;
+ return 1;
}
- } else if (arr1[0] == QueryService.UNDEFINED || arr2[0] == QueryService.UNDEFINED) {
- if (arr1[0] == QueryService.UNDEFINED) {
- result = (arr2[0] == QueryService.UNDEFINED ? 0 : -1);
+ } else if (o1 == QueryService.UNDEFINED || o2 == QueryService.UNDEFINED) {
+ if (o1 == QueryService.UNDEFINED) {
+ if (o2 == QueryService.UNDEFINED) {
+ continue;
+ }
+ return -1;
} else {
- result = 1;
+ return 1;
}
- } else {
- if (arr1[0] instanceof Number && arr2[0] instanceof Number) {
- double diff = ((Number) arr1[0]).doubleValue() - ((Number) arr2[0]).doubleValue();
- result = diff > 0 ? 1 : diff < 0 ? -1 : 0;
+ }
+
+ if (o1 instanceof Comparable) {
+ final int rslt;
+ if (o1 instanceof Number && o2 instanceof Number) {
+ double diff = ((Number) o1).doubleValue() - ((Number) o2).doubleValue();
+ rslt = diff > 0 ? 1 : diff < 0 ? -1 : 0;
} else {
- if (arr1[0] instanceof PdxString && arr2[0] instanceof String) {
- arr2[0] = new PdxString((String) arr2[0]);
- } else if (arr2[0] instanceof PdxString && arr1[0] instanceof String) {
- arr1[0] = new PdxString((String) arr1[0]);
+ if (o1 instanceof PdxString && o2 instanceof String) {
+ o2 = new PdxString((String) o2);
+ } else if (o2 instanceof PdxString && o1 instanceof String) {
+ o1 = new PdxString((String) o1);
}
- result = ((Comparable) arr1[0]).compareTo(arr2[0]);
+ rslt = ((Comparable) o1).compareTo(o2);
}
-
- }
-
- // equals.
- if (result == 0) {
- continue;
- } else {
- // not equal, change the sign based on the order by type (asc,
- // desc).
- if (((Boolean) arr1[1]).booleanValue()) {
- result = (result * -1);
+ if (rslt == 0) {
+ continue;
+ } else {
+ return rslt;
}
- return result;
+ } else if (!o1.equals(o2)) {
+ return -1;
}
}
- QueryObserver observer = QueryObserverHolder.getInstance();
- if (observer != null) {
- observer.orderByColumnsEqual();
+ return 0;
+ } else {
+ if (obj1 instanceof PdxString && obj2 instanceof String) {
+ obj2 = new PdxString((String) obj2);
+ } else if (obj2 instanceof PdxString && obj1 instanceof String) {
+ obj1 = new PdxString((String) obj1);
}
- // The comparable fields are equal, so we check if the overall keys are
- // equal or not
- if (this.objType.isStructType()) {
- int i = 0;
- for (Object o1 : (Object[]) obj1) {
- Object o2 = ((Object[]) obj2)[i++];
-
- // Check for null value.
- if (o1 == null || o2 == null) {
- if (o1 == null) {
- if (o2 == null) {
- continue;
- }
- return -1;
- } else {
- return 1;
- }
- } else if (o1 == QueryService.UNDEFINED || o2 == QueryService.UNDEFINED) {
- if (o1 == QueryService.UNDEFINED) {
- if (o2 == QueryService.UNDEFINED) {
- continue;
- }
- return -1;
- } else {
- return 1;
- }
- }
- if (o1 instanceof Comparable) {
- final int rslt;
- if (o1 instanceof Number && o2 instanceof Number) {
- double diff = ((Number) o1).doubleValue() - ((Number) o2).doubleValue();
- rslt = diff > 0 ? 1 : diff < 0 ? -1 : 0;
- } else {
- if (o1 instanceof PdxString && o2 instanceof String) {
- o2 = new PdxString((String) o2);
- } else if (o2 instanceof PdxString && o1 instanceof String) {
- o1 = new PdxString((String) o1);
- }
- rslt = ((Comparable) o1).compareTo(o2);
- }
- if (rslt == 0) {
- continue;
- } else {
- return rslt;
- }
- } else if (!o1.equals(o2)) {
- return -1;
- }
- }
- return 0;
+ if (obj1 instanceof Comparable) {
+ return ((Comparable) obj1).compareTo(obj2);
} else {
- if (obj1 instanceof PdxString && obj2 instanceof String) {
- obj2 = new PdxString((String) obj2);
- } else if (obj2 instanceof PdxString && obj1 instanceof String) {
- obj1 = new PdxString((String) obj1);
- }
-
- if (obj1 instanceof Comparable) {
- return ((Comparable) obj1).compareTo(obj2);
- } else {
- return obj1.equals(obj2) ? 0 : -1;
- }
+ return obj1.equals(obj2) ? 0 : -1;
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/b3fc0c81/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
index edd1d89..a695a42 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparatorUnmapped.java
@@ -24,8 +24,10 @@ import java.util.Map;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.pdx.internal.PdxString;
@Deprecated
public class OrderByComparatorUnmapped extends OrderByComparator {
@@ -53,6 +55,64 @@ public class OrderByComparatorUnmapped extends OrderByComparator {
}
@Override
+ public int evaluateSortCriteria(Object obj1, Object obj2) {
+ int result = -1;
+ Object[] list1 = this.evaluateSortCriteria(obj1);
+ Object[] list2 = this.evaluateSortCriteria(obj2);
+
+ if (list1.length != list2.length) {
+ Support.assertionFailed("Error Occurred due to improper sort criteria evaluation ");
+ } else {
+ for (int i = 0; i < list1.length; i++) {
+ Object arr1[] = (Object[]) list1[i];
+ Object arr2[] = (Object[]) list2[i];
+ // check for null.
+ if (arr1[0] == null || arr2[0] == null) {
+ if (arr1[0] == null) {
+ result = (arr2[0] == null ? 0 : -1);
+ } else {
+ result = 1;
+ }
+ } else if (arr1[0] == QueryService.UNDEFINED || arr2[0] == QueryService.UNDEFINED) {
+ if (arr1[0] == QueryService.UNDEFINED) {
+ result = (arr2[0] == QueryService.UNDEFINED ? 0 : -1);
+ } else {
+ result = 1;
+ }
+ } else {
+ if (arr1[0] instanceof Number && arr2[0] instanceof Number) {
+ double diff = ((Number) arr1[0]).doubleValue() - ((Number) arr2[0]).doubleValue();
+ result = diff > 0 ? 1 : diff < 0 ? -1 : 0;
+ } else {
+ if (arr1[0] instanceof PdxString && arr2[0] instanceof String) {
+ arr2[0] = new PdxString((String) arr2[0]);
+ } else if (arr2[0] instanceof PdxString && arr1[0] instanceof String) {
+ arr1[0] = new PdxString((String) arr1[0]);
+ }
+ result = ((Comparable) arr1[0]).compareTo(arr2[0]);
+ }
+
+ }
+
+ // equals.
+ if (result == 0) {
+ continue;
+ } else {
+ // not equal, change the sign based on the order by type (asc,
+ // desc).
+ if (((Boolean) arr1[1]).booleanValue()) {
+ result = (result * -1);
+ }
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+
+
+ @Override
protected Object[] evaluateSortCriteria(Object row) {
return (Object[]) orderByMap.get(row);
}
[41/69] [abbrv] geode git commit: GEODE-1279: rename
Bug51193DUnitTest to ClientFunctionTimeoutRegressionTest
Posted by ud...@apache.org.
GEODE-1279: rename Bug51193DUnitTest to ClientFunctionTimeoutRegressionTest
* renamed test class and cleaned up test code
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a5479727
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a5479727
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a5479727
Branch: refs/heads/feature/GEODE-2580
Commit: a54797278b056dc97076b7412289f9868a7c3028
Parents: a22b940
Author: Kirk Lund <kl...@apache.org>
Authored: Tue May 16 16:34:37 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue May 16 18:11:35 2017 -0700
----------------------------------------------------------------------
.../cache/execute/Bug51193DUnitTest.java | 243 -------------------
.../ClientFunctionTimeoutRegressionTest.java | 225 +++++++++++++++++
2 files changed, 225 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a5479727/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
deleted file mode 100644
index 0dfbe6c..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/Bug51193DUnitTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.cache.execute;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.PartitionAttributesFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.ClientRegionFactory;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionAdapter;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.tier.ClientHandShake;
-import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
-import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.test.dunit.DistributedTestUtils;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-@Category(DistributedTest.class)
-@SuppressWarnings("serial")
-public class Bug51193DUnitTest extends JUnit4DistributedTestCase {
-
- private static final String REGION_NAME = "Bug51193DUnitTest_region";
-
- private static GemFireCacheImpl cache;
-
- private static VM server0;
-
- private VM client0;
-
- @Override
- public final void postSetUp() throws Exception {
- Host host = Host.getHost(0);
- server0 = host.getVM(0);
- client0 = host.getVM(1);
- }
-
- @Override
- public final void preTearDown() throws Exception {
- closeCache();
- server0.invoke(() -> Bug51193DUnitTest.closeCache());
- client0.invoke(() -> Bug51193DUnitTest.closeCache());
- }
-
- public static void closeCache() {
- System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT");
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache.getDistributedSystem().disconnect();
- }
- }
-
- @SuppressWarnings("deprecation")
- public static void createClientCache(String hostName, Integer port, Integer timeout)
- throws Exception {
- try {
- if (timeout > 0) {
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT",
- String.valueOf(timeout));
- }
- Properties props = new Properties();
- props.setProperty(LOCATORS, "");
- props.setProperty(MCAST_PORT, "0");
- DistributedSystem ds = new Bug51193DUnitTest().getSystem(props);
- ds.disconnect();
- ClientCacheFactory ccf = new ClientCacheFactory(props);
- ccf.addPoolServer(hostName, port);
- cache = (GemFireCacheImpl) ccf.create();
-
- ClientRegionFactory<String, String> crf =
- cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
-
- crf.create(REGION_NAME);
- } finally {
- System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT");
- }
- }
-
- @SuppressWarnings("deprecation")
- public static Integer createServerCache(Boolean createPR) throws Exception {
- Properties props = new Properties();
- props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
-
- Bug51193DUnitTest test = new Bug51193DUnitTest();
- DistributedSystem ds = test.getSystem(props);
- ds.disconnect();
- cache = (GemFireCacheImpl) CacheFactory.create(test.getSystem());
-
- RegionFactory<String, String> rf = null;
- if (createPR) {
- rf = cache.createRegionFactory(RegionShortcut.PARTITION);
- rf.setPartitionAttributes(new PartitionAttributesFactory<String, String>()
- .setRedundantCopies(1).setTotalNumBuckets(4).create());
- } else {
- rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- }
-
- rf.create(REGION_NAME);
-
- CacheServer server = cache.addCacheServer();
- server.setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
- server.start();
- return server.getPort();
- }
-
- public static void executeFunction(String mode, Integer timeout) {
- Function function = new TestFunction(mode + timeout);
- FunctionService.registerFunction(function);
- Execution dataSet = null;
- if ("region".equalsIgnoreCase(mode)) {
- dataSet = FunctionService.onRegion(cache.getRegion(REGION_NAME)).setArguments(timeout);
- } else if ("server".equalsIgnoreCase(mode)) {
- dataSet = FunctionService.onServer(cache.getDefaultPool()).setArguments(timeout);
- } else {
- dataSet = FunctionService.onServers(cache).setArguments(timeout);
- }
- ResultCollector rs = dataSet.execute(function);
- assertTrue("Server did not read client_function_timeout from client.",
- (Boolean) ((ArrayList) rs.getResult()).get(0));
- }
-
- @SuppressWarnings("rawtypes")
- public static void doPutsAndGet(Integer num) {
- Region r = cache.getRegion(REGION_NAME);
- for (int i = 0; i < num; ++i) {
- r.put("KEY_" + i, "VALUE_" + i);
- }
- r.get("KEY_0");
- }
-
- public void doTest(boolean createPR, int timeout, String mode) throws Throwable {
- // start server
- int port = (Integer) server0.invoke(() -> Bug51193DUnitTest.createServerCache(createPR));
- // start client
- client0.invoke(
- () -> Bug51193DUnitTest.createClientCache(client0.getHost().getHostName(), port, timeout));
- // do puts and get
- server0.invoke(() -> Bug51193DUnitTest.doPutsAndGet(10));
- // execute function & verify timeout has been received at server.
- client0.invoke(() -> Bug51193DUnitTest.executeFunction(mode, timeout));
- }
-
- @Test
- public void testExecuteFunctionReadsDefaultTimeout() throws Throwable {
- doTest(false, 0, "server");
- }
-
- @Test
- public void testExecuteRegionFunctionReadsDefaultTimeout() throws Throwable {
- doTest(false, 0, "region");
- }
-
- @Test
- public void testExecuteRegionFunctionSingleHopReadsDefaultTimeout() throws Throwable {
- doTest(true, 0, "region");
- }
-
- @Test
- public void testExecuteFunctionReadsTimeout() throws Throwable {
- doTest(false, 6000, "server");
- }
-
- @Test
- public void testExecuteRegionFunctionReadsTimeout() throws Throwable {
- doTest(false, 6000, "region");
- }
-
- @Test
- public void testExecuteRegionFunctionSingleHopReadsTimeout() throws Throwable {
- doTest(true, 6000, "region");
- }
-
- static class TestFunction extends FunctionAdapter {
-
- private String id;
-
- public TestFunction(String id) {
- this.id = id;
- }
-
- @Override
- public void execute(FunctionContext context) {
- boolean timeoutMatches = false;
- int expected = (Integer) context.getArguments();
- AcceptorImpl acceptor = ((CacheServerImpl) cache.getCacheServers().get(0)).getAcceptor();
- ServerConnection[] scs = acceptor.getAllServerConnectionList();
- for (int i = 0; i < scs.length; ++i) {
- ClientHandShake hs = scs[i].getHandshake();
- if (hs != null && expected == hs.getClientReadTimeout()) {
- timeoutMatches = true;
- }
- }
-
- context.getResultSender().lastResult(timeoutMatches);
- }
-
- @Override
- public String getId() {
- return this.id;
- }
-
- @Override
- public boolean isHA() {
- return false;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/a5479727/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
new file mode 100644
index 0000000..b69a6b9
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.execute;
+
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.client.internal.InternalClientCache;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.cache.CacheServerImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.tier.ClientHandShake;
+import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
+import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Properties;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
+@Category(DistributedTest.class)
+@RunWith(JUnitParamsRunner.class)
+@SuppressWarnings("serial")
+public class ClientFunctionTimeoutRegressionTest extends JUnit4DistributedTestCase {
+
+ private static final String REGION_NAME =
+ ClientFunctionTimeoutRegressionTest.class.getSimpleName() + "_region";
+
+ private static InternalCache serverCache;
+
+ private static InternalClientCache clientCache;
+
+ private VM server;
+
+ private VM client;
+
+ @Rule
+ public DistributedRestoreSystemProperties restoreSystemProperties =
+ new DistributedRestoreSystemProperties();
+
+ @Before
+ public void before() throws Exception {
+ server = Host.getHost(0).getVM(0);
+ client = Host.getHost(0).getVM(1);
+
+ disconnectAllFromDS();
+ }
+
+ @After
+ public void after() throws Exception {
+ Invoke.invokeInEveryVM(() -> closeCache());
+ }
+
+ @Test
+ @Parameters({"false,0,server", "false,0,region", "true,0,region", "false,6000,server",
+ "false,6000,region", "true,6000,region"})
+ public void testExecuteFunctionReadsDefaultTimeout(boolean createPR, int timeout, String mode)
+ throws Exception {
+ // start server
+ int port = server.invoke(() -> createServerCache(createPR));
+ // start client
+ client.invoke(() -> createClientCache(client.getHost().getHostName(), port, timeout));
+ // do puts and get
+ server.invoke(() -> doPutsAndGet(10));
+ // execute function & verify timeout has been received at server.
+ client.invoke(() -> executeFunction(mode, timeout));
+ }
+
+ private void closeCache() {
+ if (clientCache != null) {
+ clientCache.close();
+ clientCache = null;
+ }
+ if (serverCache != null) {
+ serverCache.close();
+ serverCache = null;
+ }
+ }
+
+ private void createClientCache(String hostName, Integer port, Integer timeout) {
+ if (timeout > 0) {
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "CLIENT_FUNCTION_TIMEOUT",
+ String.valueOf(timeout));
+ }
+
+ Properties props = new Properties();
+ props.setProperty(LOCATORS, "");
+ props.setProperty(MCAST_PORT, "0");
+
+ ClientCacheFactory ccf = new ClientCacheFactory(props);
+ ccf.addPoolServer(hostName, port);
+ clientCache = (InternalClientCache) ccf.create();
+
+ ClientRegionFactory<String, String> crf =
+ clientCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
+
+ crf.create(REGION_NAME);
+ }
+
+ private Integer createServerCache(Boolean createPR) throws IOException {
+ Properties props = new Properties();
+ props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
+
+ serverCache = (InternalCache) new CacheFactory(props).create();
+
+ RegionFactory<String, String> rf;
+ if (createPR) {
+ rf = serverCache.createRegionFactory(RegionShortcut.PARTITION);
+ rf.setPartitionAttributes(new PartitionAttributesFactory<String, String>()
+ .setRedundantCopies(1).setTotalNumBuckets(4).create());
+ } else {
+ rf = serverCache.createRegionFactory(RegionShortcut.REPLICATE);
+ }
+
+ rf.create(REGION_NAME);
+
+ CacheServer server = serverCache.addCacheServer();
+ server.setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
+ server.start();
+ return server.getPort();
+ }
+
+ private void executeFunction(String mode, Integer timeout) {
+ Function function = new TestFunction(mode + timeout);
+ FunctionService.registerFunction(function);
+ Execution dataSet;
+ if ("region".equalsIgnoreCase(mode)) {
+ dataSet = FunctionService.onRegion(clientCache.getRegion(REGION_NAME)).setArguments(timeout);
+ } else if ("server".equalsIgnoreCase(mode)) {
+ dataSet = FunctionService.onServer(clientCache.getDefaultPool()).setArguments(timeout);
+ } else {
+ dataSet = FunctionService.onServers(clientCache).setArguments(timeout);
+ }
+ ResultCollector rs = dataSet.execute(function);
+ assertThat((Boolean) ((ArrayList) rs.getResult()).get(0))
+ .as("Server did not read client_function_timeout from client.").isTrue();
+ }
+
+ private void doPutsAndGet(Integer num) {
+ Region r = serverCache.getRegion(REGION_NAME);
+ for (int i = 0; i < num; ++i) {
+ r.put("KEY_" + i, "VALUE_" + i);
+ }
+ r.get("KEY_0");
+ }
+
+ private static class TestFunction extends FunctionAdapter {
+
+ private final String id;
+
+ public TestFunction(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public void execute(FunctionContext context) {
+ boolean timeoutMatches = false;
+ int expected = (Integer) context.getArguments();
+ AcceptorImpl acceptor =
+ ((CacheServerImpl) serverCache.getCacheServers().get(0)).getAcceptor();
+ ServerConnection[] scs = acceptor.getAllServerConnectionList();
+ for (ServerConnection sc : scs) {
+ ClientHandShake hs = sc.getHandshake();
+ if (hs != null && expected == hs.getClientReadTimeout()) {
+ timeoutMatches = true;
+ }
+ }
+
+ context.getResultSender().lastResult(timeoutMatches);
+ }
+
+ @Override
+ public String getId() {
+ return this.id;
+ }
+
+ @Override
+ public boolean isHA() {
+ return false;
+ }
+ }
+}
[10/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
index 4be97cb..011bf26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,14 +64,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -68,6 +98,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -99,13 +130,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -121,7 +158,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -145,7 +184,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -156,19 +195,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -185,7 +227,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -193,7 +235,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -218,7 +262,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -258,105 +301,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -373,6 +421,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -390,6 +439,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -419,6 +469,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -451,13 +502,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
index b4e861d..ffba17a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,10 +64,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -74,9 +101,11 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -85,6 +114,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -116,13 +146,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -138,7 +174,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -162,7 +200,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -173,19 +211,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -202,7 +243,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -210,7 +251,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -235,7 +278,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -275,105 +317,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -390,6 +437,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -407,6 +455,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -436,6 +485,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -468,8 +518,11 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -483,7 +536,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -502,6 +555,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -531,5 +585,8 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
index 1652cb3..85a66ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -15,36 +15,48 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -52,10 +64,25 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -86,9 +113,11 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -97,6 +126,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -128,13 +158,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -150,7 +186,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -174,7 +212,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -185,19 +223,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -214,7 +255,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -222,7 +263,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -247,7 +290,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -287,105 +329,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -402,6 +449,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -419,6 +467,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -448,6 +497,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -480,8 +530,11 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -500,7 +553,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -530,6 +583,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -572,5 +626,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
index 1f28498..804623b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -15,37 +15,50 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -53,15 +66,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
extends VersionedThinDiskLRURegionEntryOffHeap {
public VersionedThinDiskLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -70,6 +102,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
private static final AtomicLongFieldUpdater<VersionedThinDiskLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -101,13 +134,19 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -123,7 +162,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -147,7 +188,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -158,19 +199,22 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -187,7 +231,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -195,7 +239,9 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -220,7 +266,6 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -260,105 +305,110 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -375,6 +425,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -392,6 +443,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -421,6 +473,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -453,13 +506,16 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -472,5 +528,8 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
index 96e97f1..eefae22 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
@@ -15,42 +15,71 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskRegionEntryHeap {
- public VersionedThinDiskRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VersionedThinDiskRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -59,10 +88,11 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapIntKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -82,7 +112,7 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -93,19 +123,22 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -115,7 +148,9 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -140,7 +175,6 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -180,7 +214,11 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -197,6 +235,7 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -214,6 +253,7 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -243,6 +283,7 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -275,12 +316,17 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -291,5 +337,8 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
index 5d3199c..a52fc3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
@@ -15,43 +15,71 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRegionEntryHeap {
public VersionedThinDiskRegionEntryHeapLongKey(RegionEntryContext context, long key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -60,10 +88,11 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapLongKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -83,7 +112,7 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -94,19 +123,22 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -116,7 +148,9 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -141,7 +175,6 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -181,7 +214,11 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -198,6 +235,7 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -215,6 +253,7 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -244,6 +283,7 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -276,12 +316,15 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -292,5 +335,8 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
index 8eb828b..8c9706c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
@@ -15,43 +15,70 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDiskRegionEntryHeap {
public VersionedThinDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -60,10 +87,11 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -83,7 +111,7 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -94,19 +122,22 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -116,7 +147,9 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -141,7 +174,6 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -181,7 +213,11 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -198,6 +234,7 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -215,6 +252,7 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -244,6 +282,7 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -276,13 +315,19 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
index d4f5563..9491844 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
@@ -15,39 +15,63 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDiskRegionEntryHeap {
public VersionedThinDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -66,9 +90,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -77,10 +103,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -100,7 +127,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -111,19 +138,22 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -133,7 +163,9 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -158,7 +190,6 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -198,7 +229,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -215,6 +250,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -232,6 +268,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -261,6 +298,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -293,8 +331,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -308,7 +349,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -327,6 +368,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -356,5 +398,8 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
index 8f0dc99..bb21686 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
@@ -15,21 +15,29 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -37,17 +45,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDiskRegionEntryHeap {
public VersionedThinDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -78,9 +102,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -89,10 +115,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
private static final AtomicLongFieldUpdater<VersionedThinDiskRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinDiskRegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -112,7 +139,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -123,19 +150,22 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -145,7 +175,9 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -170,7 +202,6 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -210,7 +241,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -227,6 +262,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -244,6 +280,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -273,6 +310,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -305,8 +343,11 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -325,7 +366,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -355,6 +396,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -397,5 +439,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[47/69] [abbrv] geode git commit: GEODE-2874: Fix
StringIndexOutOfBoundsException while initializing logger
Posted by ud...@apache.org.
GEODE-2874: Fix StringIndexOutOfBoundsException while initializing logger
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/90ee3d8a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/90ee3d8a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/90ee3d8a
Branch: refs/heads/feature/GEODE-2580
Commit: 90ee3d8a0f071f83e19f7c28f78e2d470282e0de
Parents: 15245df
Author: Jared Stewart <js...@pivotal.io>
Authored: Thu May 18 08:25:30 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Thu May 18 08:25:30 2017 -0700
----------------------------------------------------------------------
.../io/MainWithChildrenRollingFileHandler.java | 5 +-
...WithChildrenRollingFileHandlerDUnitTest.java | 50 ++++++++++++++++++++
...ildrenRollingFileHandlerIntegrationTest.java | 11 +++++
.../dunit/rules/LocatorServerStartupRule.java | 2 +-
4 files changed, 66 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/90ee3d8a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
index f814aeb..225d1bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
@@ -43,9 +43,12 @@ public class MainWithChildrenRollingFileHandler implements RollingFileHandler {
String baseName;
if (endIdx1 != -1) {
baseName = file.getName().substring(0, endIdx1);
- } else {
+ } else if (endIdx2 != -1) {
baseName = file.getName().substring(0, endIdx2);
+ } else {
+ baseName = file.getName();
}
+
File[] children = findChildren(dir, CHILD_ID_PATTERN);
/* Search child logs */
http://git-wip-us.apache.org/repos/asf/geode/blob/90ee3d8a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
new file mode 100644
index 0000000..6032b46
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.io;
+
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.test.dunit.rules.Locator;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.net.InetAddress;
+
+@Category(DistributedTest.class)
+public class MainWithChildrenRollingFileHandlerDUnitTest {
+
+ @Rule
+ public LocatorServerStartupRule locatorServerStartupRule = new LocatorServerStartupRule();
+
+ @Test
+ public void testGeode2874_nameWithoutExtensionDoesNotThrowOnMemberRestart() throws Exception {
+ MemberVM<Locator> locatorVM = locatorServerStartupRule.startLocatorVM(0);
+
+ ClientCacheFactory clientCacheFactory = new ClientCacheFactory();
+ clientCacheFactory.addPoolLocator(InetAddress.getLocalHost().toString(), locatorVM.getPort());
+ clientCacheFactory.set(LOG_FILE, "nameWithoutExtension");
+ ClientCache clientCache = clientCacheFactory.create();
+
+ clientCache.close();
+ ClientCache clientCache2 = clientCacheFactory.create();
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/90ee3d8a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
index 5ea77c4..4c7cdfc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
@@ -16,12 +16,14 @@ package org.apache.geode.internal.io;
import static org.assertj.core.api.Assertions.*;
+import java.io.File;
import java.util.regex.Pattern;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -35,6 +37,9 @@ public class MainWithChildrenRollingFileHandlerIntegrationTest {
@Rule
public TestName testName = new TestName();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
@Before
public void before() throws Exception {
this.name = this.testName.getMethodName();
@@ -93,4 +98,10 @@ public class MainWithChildrenRollingFileHandlerIntegrationTest {
.isInstanceOf(IllegalArgumentException.class);
}
+ @Test
+ public void calcNextChildId_noExtensionInFilename_doesNotThrow() {
+ File file = new File(temporaryFolder.getRoot(), "fileWithoutExtension");
+ assertThat(handler.calcNextChildId(file, 0)).isEqualTo(1);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/geode/blob/90ee3d8a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
index b86e058..055993c 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
@@ -79,7 +79,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
.forEach(MemberVM::stopMemberAndCleanupVMIfNecessary);
}
- public MemberVM startLocatorVM(int index) throws Exception {
+ public MemberVM<Locator> startLocatorVM(int index) throws Exception {
return startLocatorVM(index, new Properties());
}
[52/69] [abbrv] geode git commit: GEODE-2662: Gfsh displays field
value on wrong line when receiving objects with missing fields
Posted by ud...@apache.org.
GEODE-2662: Gfsh displays field value on wrong line when receiving objects with missing fields
* DataCommandResult.buildTable refactored to scan for all necessary fields and build rows, padding with MISSING_VALUE as necessary.
* ServerStarterRule adjusted to build .withPDXPersistent() rather than take it as input to .startServer()
* Refactored a great deal for readability.
* this closes #500
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9af854aa
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9af854aa
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9af854aa
Branch: refs/heads/feature/GEODE-2580
Commit: 9af854aa4ec1b32b4668c4faa2f225f267590239
Parents: da6c28c
Author: Patrick Rhomberg <pr...@pivotal.io>
Authored: Tue May 2 11:09:35 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri May 19 08:09:57 2017 -0700
----------------------------------------------------------------------
geode-core/build.gradle | 4 +-
.../internal/cli/commands/DataCommands.java | 484 ++++++++--------
.../internal/cli/domain/DataCommandResult.java | 554 ++++++++++---------
.../cli/functions/DataCommandFunction.java | 533 +++++++++---------
.../internal/cli/result/TabularResultData.java | 74 +--
.../dunit/QueryDataInconsistencyDUnitTest.java | 18 +-
.../commands/GemfireDataCommandsDUnitTest.java | 28 +-
.../DataCommandFunctionWithPDXJUnitTest.java | 220 ++++++++
.../test/dunit/rules/ServerStarterRule.java | 13 +-
9 files changed, 1060 insertions(+), 868 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index f07444a..0297146 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -113,8 +113,7 @@ dependencies {
compile 'commons-beanutils:commons-beanutils:' + project.'commons-beanutils.version'
// https://mvnrepository.com/artifact/io.github.lukehutch/fast-classpath-scanner
- compile 'io.github.lukehutch:fast-classpath-scanner:' + project.'fast-classpath-scanner.version'
-
+ compile 'io.github.lukehutch:fast-classpath-scanner:' + project.'fast-classpath-scanner.version'
compile project(':geode-common')
@@ -127,7 +126,6 @@ dependencies {
// Test Dependencies
// External
- testCompile 'com.google.guava:guava:' + project.'guava.version'
testCompile 'com.jayway.jsonpath:json-path-assert:' + project.'json-path-assert.version'
testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
testRuntime 'org.apache.derby:derby:' + project.'derby.version'
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index 89db5d1..a38e545 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -14,27 +14,9 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.shiro.subject.Subject;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
@@ -79,6 +61,26 @@ import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
+import org.apache.shiro.subject.Subject;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* @since GemFire 7.0
@@ -118,8 +120,8 @@ public class DataCommands implements CommandMarker {
help = CliStrings.REBALANCE__SIMULATE__HELP) boolean simulate) {
ExecutorService commandExecutors = Executors.newSingleThreadExecutor();
- List<Future<Result>> commandResult = new ArrayList<Future<Result>>();
- Result result = null;
+ List<Future<Result>> commandResult = new ArrayList<>();
+ Result result;
try {
commandResult.add(commandExecutors
.submit(new ExecuteRebalanceWithTimeout(includeRegions, excludeRegions, simulate)));
@@ -165,16 +167,16 @@ public class DataCommands implements CommandMarker {
Result result = null;
try {
- RebalanceOperation op = null;
+ RebalanceOperation op;
- if (includeRegions != null && includeRegions.length > 0) {
- CompositeResultData rebalanceResulteData = ResultBuilder.createCompositeResultData();
+ if (ArrayUtils.isNotEmpty(includeRegions)) {
+ CompositeResultData rebalanceResultData = ResultBuilder.createCompositeResultData();
int index = 0;
for (String regionName : includeRegions) {
// To be removed after region Name specification with "/" is fixed
- regionName = regionName.startsWith("/") == true ? regionName : ("/" + regionName);
+ regionName = regionName.startsWith("/") ? regionName : ("/" + regionName);
Region region = cache.getRegion(regionName);
if (region == null) {
@@ -189,21 +191,18 @@ public class DataCommands implements CommandMarker {
Function rebalanceFunction = new RebalanceFunction();
Object[] functionArgs = new Object[3];
functionArgs[0] = simulate ? "true" : "false";
- Set<String> setRegionName = new HashSet<String>();
+ Set<String> setRegionName = new HashSet<>();
setRegionName.add(regionName);
functionArgs[1] = setRegionName;
- Set<String> excludeRegionSet = new HashSet<String>();
- if (excludeRegions != null && excludeRegions.length > 0) {
-
- for (String str : excludeRegions) {
- excludeRegionSet.add(str);
- }
+ Set<String> excludeRegionSet = new HashSet<>();
+ if (ArrayUtils.isNotEmpty(excludeRegions)) {
+ Collections.addAll(excludeRegionSet, excludeRegions);
}
functionArgs[2] = excludeRegionSet;
- if (simulate == true) {
- List resultList = null;
+ if (simulate) {
+ List resultList;
try {
resultList = (ArrayList) CliUtil
.executeFunction(rebalanceFunction, functionArgs, member).getResult();
@@ -212,24 +211,24 @@ public class DataCommands implements CommandMarker {
.info(CliStrings.format(
CliStrings.REBALANCE__MSG__EXCEPTION_IN_REBALANCE_FOR_MEMBER_0_Exception_1,
member.getId(), ex.getMessage()), ex);
- rebalanceResulteData.addSection()
+ rebalanceResultData.addSection()
.addData(CliStrings.format(
CliStrings.REBALANCE__MSG__EXCEPTION_IN_REBALANCE_FOR_MEMBER_0_Exception,
member.getId()), ex.getMessage());
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
- if (checkResultList(rebalanceResulteData, resultList, member) == true) {
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ if (checkResultList(rebalanceResultData, resultList, member)) {
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
List<String> rstList = tokenize((String) resultList.get(0), ",");
- result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResulteData,
- (ArrayList) rstList, index, simulate, cache));
+ result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResultData,
+ (ArrayList) rstList, index, true, cache));
} else {
- List resultList = null;
+ List resultList;
try {
resultList = (ArrayList) CliUtil
.executeFunction(rebalanceFunction, functionArgs, member).getResult();
@@ -238,47 +237,47 @@ public class DataCommands implements CommandMarker {
.info(CliStrings.format(
CliStrings.REBALANCE__MSG__EXCEPTION_IN_REBALANCE_FOR_MEMBER_0_Exception_1,
member.getId(), ex.getMessage()), ex);
- rebalanceResulteData.addSection()
+ rebalanceResultData.addSection()
.addData(CliStrings.format(
CliStrings.REBALANCE__MSG__EXCEPTION_IN_REBALANCE_FOR_MEMBER_0_Exception,
member.getId()), ex.getMessage());
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
- if (checkResultList(rebalanceResulteData, resultList, member) == true) {
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ if (checkResultList(rebalanceResultData, resultList, member)) {
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
List<String> rstList = tokenize((String) resultList.get(0), ",");
- result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResulteData,
- (ArrayList) rstList, index, simulate, cache));
+ result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResultData,
+ (ArrayList) rstList, index, false, cache));
}
} else {
+
ResourceManager manager = cache.getResourceManager();
RebalanceFactory rbFactory = manager.createRebalanceFactory();
- Set<String> excludeRegionSet = new HashSet<String>();
+ Set<String> excludeRegionSet = new HashSet<>();
if (excludeRegions != null) {
- for (String excludeRegion : excludeRegions)
- excludeRegionSet.add(excludeRegion);
+ Collections.addAll(excludeRegionSet, excludeRegions);
}
rbFactory.excludeRegions(excludeRegionSet);
- Set<String> includeRegionSet = new HashSet<String>();
+ Set<String> includeRegionSet = new HashSet<>();
includeRegionSet.add(regionName);
rbFactory.includeRegions(includeRegionSet);
- if (simulate == true) {
+ if (simulate) {
op = manager.createRebalanceFactory().simulate();
- result = ResultBuilder.buildResult(buildResultForRebalance(rebalanceResulteData,
- op.getResults(), index, simulate, cache));
+ result = ResultBuilder.buildResult(buildResultForRebalance(rebalanceResultData,
+ op.getResults(), index, true, cache));
} else {
op = manager.createRebalanceFactory().start();
// Wait until the rebalance is complete and then get the results
- result = ResultBuilder.buildResult(buildResultForRebalance(rebalanceResulteData,
- op.getResults(), index, simulate, cache));
+ result = ResultBuilder.buildResult(buildResultForRebalance(rebalanceResultData,
+ op.getResults(), index, false, cache));
}
}
index++;
@@ -297,9 +296,9 @@ public class DataCommands implements CommandMarker {
}
}
- List<String> tokenize(String str, String separator) {
+ private List<String> tokenize(String str, String separator) {
StringTokenizer st = new StringTokenizer(str, separator);
- List<String> rstList = new ArrayList<String>();
+ List<String> rstList = new ArrayList<>();
while (st.hasMoreTokens()) {
rstList.add(st.nextToken());
@@ -308,16 +307,15 @@ public class DataCommands implements CommandMarker {
return rstList;
}
- boolean checkResultList(CompositeResultData rebalanceResulteData, List resultList,
+ private boolean checkResultList(CompositeResultData rebalanceResultData, List resultList,
DistributedMember member) {
boolean toContinueForOtherMembers = false;
- if (resultList != null && !resultList.isEmpty()) {
- for (int i = 0; i < resultList.size(); i++) {
- Object object = resultList.get(i);
+ if (CollectionUtils.isNotEmpty(resultList)) {
+ for (Object object : resultList) {
if (object instanceof Exception) {
- rebalanceResulteData.addSection().addData(
+ rebalanceResultData.addSection().addData(
CliStrings.format(CliStrings.REBALANCE__MSG__NO_EXECUTION, member.getId()),
((Exception) object).getMessage());
@@ -327,7 +325,7 @@ public class DataCommands implements CommandMarker {
toContinueForOtherMembers = true;
break;
} else if (object instanceof Throwable) {
- rebalanceResulteData.addSection().addData(
+ rebalanceResultData.addSection().addData(
CliStrings.format(CliStrings.REBALANCE__MSG__NO_EXECUTION, member.getId()),
((Throwable) object).getMessage());
@@ -341,7 +339,7 @@ public class DataCommands implements CommandMarker {
} else {
LogWrapper.getInstance().info(
"Rebalancing for member=" + member.getId() + ", resultList is either null or empty");
- rebalanceResulteData.addSection().addData("Rebalancing for member=" + member.getId(),
+ rebalanceResultData.addSection().addData("Rebalancing for member=" + member.getId(),
", resultList is either null or empty");
toContinueForOtherMembers = true;
}
@@ -349,15 +347,14 @@ public class DataCommands implements CommandMarker {
return toContinueForOtherMembers;
}
- Result executeRebalanceOnDS(InternalCache cache, String simulate, String[] excludeRegionsList) {
+ private Result executeRebalanceOnDS(InternalCache cache, String simulate,
+ String[] excludeRegionsList) {
Result result = null;
int index = 1;
- CompositeResultData rebalanceResulteData = ResultBuilder.createCompositeResultData();
- List<String> listExcludedRegion = new ArrayList<String>();
+ CompositeResultData rebalanceResultData = ResultBuilder.createCompositeResultData();
+ List<String> listExcludedRegion = new ArrayList<>();
if (excludeRegionsList != null) {
- for (String str : excludeRegionsList) {
- listExcludedRegion.add(str);
- }
+ Collections.addAll(listExcludedRegion, excludeRegionsList);
}
List<MemberPRInfo> listMemberRegion = getMemberRegionList(cache, listExcludedRegion);
@@ -377,29 +374,26 @@ public class DataCommands implements CommandMarker {
}
}
- if (flagToContinueWithRebalance == false) {
+ if (!flagToContinueWithRebalance) {
return ResultBuilder
.createInfoResult(CliStrings.REBALANCE__MSG__NO_REBALANCING_REGIONS_ON_DS);
}
- Iterator<MemberPRInfo> it1 = listMemberRegion.iterator();
- while (it1.hasNext() && flagToContinueWithRebalance) {
+ for (MemberPRInfo memberPR : listMemberRegion) {
try {
- MemberPRInfo memberPR = (MemberPRInfo) it1.next();
- // check if there are more than one members associated with region for
- // rebalancing
+ // check if there are more than one members associated with region for rebalancing
if (memberPR.dsMemberList.size() > 1) {
for (int i = 0; i < memberPR.dsMemberList.size(); i++) {
DistributedMember dsMember = memberPR.dsMemberList.get(i);
Function rebalanceFunction = new RebalanceFunction();
Object[] functionArgs = new Object[3];
functionArgs[0] = simulate;
- Set<String> regionSet = new HashSet<String>();
+ Set<String> regionSet = new HashSet<>();
regionSet.add(memberPR.region);
functionArgs[1] = regionSet;
- Set<String> excludeRegionSet = new HashSet<String>();
+ Set<String> excludeRegionSet = new HashSet<>();
functionArgs[2] = excludeRegionSet;
List resultList = null;
@@ -409,52 +403,51 @@ public class DataCommands implements CommandMarker {
resultList = (ArrayList) CliUtil
.executeFunction(rebalanceFunction, functionArgs, dsMember).getResult();
- if (checkResultList(rebalanceResulteData, resultList, dsMember) == true) {
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ if (checkResultList(rebalanceResultData, resultList, dsMember)) {
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
List<String> rstList = tokenize((String) resultList.get(0), ",");
- result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResulteData,
- (ArrayList) rstList, index, simulate.equals("true") ? true : false, cache));
+ result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResultData,
+ (ArrayList) rstList, index, simulate.equals("true"), cache));
index++;
- // Rebalancing for region is done so break and continue with
- // other region
+ // Rebalancing for region is done so break and continue with other region
break;
} else {
if (i == memberPR.dsMemberList.size() - 1) {
- rebalanceResulteData.addSection().addData(
+ rebalanceResultData.addSection().addData(
CliStrings.format(
CliStrings.REBALANCE__MSG__NO_EXECUTION_FOR_REGION_0_ON_MEMBERS_1,
memberPR.region, listOfAllMembers(memberPR.dsMemberList)),
CliStrings.REBALANCE__MSG__MEMBERS_MIGHT_BE_DEPARTED);
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ result = ResultBuilder.buildResult(rebalanceResultData);
} else {
continue;
}
}
} catch (Exception ex) {
if (i == memberPR.dsMemberList.size() - 1) {
- rebalanceResulteData.addSection().addData(
+ rebalanceResultData.addSection().addData(
CliStrings.format(
CliStrings.REBALANCE__MSG__NO_EXECUTION_FOR_REGION_0_ON_MEMBERS_1,
memberPR.region, listOfAllMembers(memberPR.dsMemberList)),
CliStrings.REBALANCE__MSG__REASON + ex.getMessage());
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ result = ResultBuilder.buildResult(rebalanceResultData);
} else {
continue;
}
}
- if (checkResultList(rebalanceResulteData, resultList, dsMember) == true) {
- result = ResultBuilder.buildResult(rebalanceResulteData);
+ if (checkResultList(rebalanceResultData, resultList, dsMember)) {
+ result = ResultBuilder.buildResult(rebalanceResultData);
continue;
}
List<String> rstList = tokenize((String) resultList.get(0), ",");
- result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResulteData,
- (ArrayList) rstList, index, simulate.equals("true") ? true : false, cache));
+ result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResultData,
+ (ArrayList) rstList, index, simulate.equals("true"), cache));
index++;
}
}
@@ -487,65 +480,59 @@ public class DataCommands implements CommandMarker {
ArrayList<String> rstlist, int index, boolean simulate, InternalCache cache) {
// add only if there are any valid regions in results
- if (rstlist.size() > resultItemCount && rstlist.get(resultItemCount) != null
- && rstlist.get(resultItemCount).length() > 0) {
+ if (rstlist.size() > resultItemCount && StringUtils.isNotEmpty(rstlist.get(resultItemCount))) {
TabularResultData table1 = rebalanceResulteData.addSection().addTable("Table" + index);
String newLine = System.getProperty("line.separator");
StringBuilder resultStr = new StringBuilder();
resultStr.append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES);
table1.accumulate("Value", rstlist.get(0));
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES + " = " + rstlist.get(0));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES).append(" = ")
+ .append(rstlist.get(0)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM);
table1.accumulate("Value", rstlist.get(1));
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM + " = " + rstlist.get(1));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM).append(" = ")
+ .append(rstlist.get(1)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED);
table1.accumulate("Value", rstlist.get(2));
- resultStr
- .append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED + " = " + rstlist.get(2));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED).append(" = ")
+ .append(rstlist.get(2)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES);
table1.accumulate("Value", rstlist.get(3));
- resultStr
- .append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES + " = " + rstlist.get(3));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES).append(" = ")
+ .append(rstlist.get(3)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME);
table1.accumulate("Value", rstlist.get(4));
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME + " = " + rstlist.get(4));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME).append(" = ")
+ .append(rstlist.get(4)).append(newLine);
table1.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED);
table1.accumulate("Value", rstlist.get(5));
- resultStr.append(
- CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED + " = " + rstlist.get(5));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED).append(" = ")
+ .append(rstlist.get(5)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME);
table1.accumulate("Value", rstlist.get(6));
- resultStr
- .append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME + " = " + rstlist.get(6));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME).append(" = ")
+ .append(rstlist.get(6)).append(newLine);
table1.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED);
table1.accumulate("Value", rstlist.get(7));
- resultStr.append(
- CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED + " = " + rstlist.get(7));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED).append(" = ")
+ .append(rstlist.get(7)).append(newLine);
table1.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALTIME);
table1.accumulate("Value", rstlist.get(8));
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALTIME + " = " + rstlist.get(8));
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALTIME).append(" = ").append(rstlist.get(8))
+ .append(newLine);
- String headerText = null;
+ String headerText;
if (simulate) {
headerText = "Simulated partition regions ";
} else {
@@ -560,81 +547,73 @@ public class DataCommands implements CommandMarker {
return rebalanceResulteData;
}
- CompositeResultData buildResultForRebalance(CompositeResultData rebalanceResulteData,
+ private CompositeResultData buildResultForRebalance(CompositeResultData rebalanceResultData,
RebalanceResults results, int index, boolean simulate, InternalCache cache) {
Set<PartitionRebalanceInfo> regions = results.getPartitionRebalanceDetails();
Iterator iterator = regions.iterator();
// add only if there are valid number of regions
- if (regions.size() > 0 && ((PartitionRebalanceInfo) iterator.next()).getRegionPath() != null
- && ((PartitionRebalanceInfo) iterator.next()).getRegionPath().length() > 0) {
+ if (regions.size() > 0
+ && StringUtils.isNotEmpty(((PartitionRebalanceInfo) iterator.next()).getRegionPath())) {
final TabularResultData resultData =
- rebalanceResulteData.addSection().addTable("Table" + index);
+ rebalanceResultData.addSection().addTable("Table" + index);
String newLine = System.getProperty("line.separator");
StringBuilder resultStr = new StringBuilder();
resultStr.append(newLine);
resultData.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES);
resultData.accumulate("Value", results.getTotalBucketCreateBytes());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES + " = "
- + results.getTotalBucketCreateBytes());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATEBYTES).append(" = ")
+ .append(results.getTotalBucketCreateBytes()).append(newLine);
resultData.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM);
resultData.accumulate("Value", results.getTotalBucketCreateTime());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM + " = "
- + results.getTotalBucketCreateTime());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATETIM).append(" = ")
+ .append(results.getTotalBucketCreateTime()).append(newLine);
resultData.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED);
resultData.accumulate("Value", results.getTotalBucketCreatesCompleted());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED + " = "
- + results.getTotalBucketCreatesCompleted());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETCREATESCOMPLETED).append(" = ")
+ .append(results.getTotalBucketCreatesCompleted()).append(newLine);
resultData.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES);
resultData.accumulate("Value", results.getTotalBucketTransferBytes());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES + " = "
- + results.getTotalBucketTransferBytes());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERBYTES).append(" = ")
+ .append(results.getTotalBucketTransferBytes()).append(newLine);
resultData.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME);
resultData.accumulate("Value", results.getTotalBucketTransferTime());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME + " = "
- + results.getTotalBucketTransferTime());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERTIME).append(" = ")
+ .append(results.getTotalBucketTransferTime()).append(newLine);
resultData.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED);
resultData.accumulate("Value", results.getTotalBucketTransfersCompleted());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED + " = "
- + results.getTotalBucketTransfersCompleted());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALBUCKETTRANSFERSCOMPLETED).append(" = ")
+ .append(results.getTotalBucketTransfersCompleted()).append(newLine);
resultData.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME);
resultData.accumulate("Value", results.getTotalPrimaryTransferTime());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME + " = "
- + results.getTotalPrimaryTransferTime());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERTIME).append(" = ")
+ .append(results.getTotalPrimaryTransferTime()).append(newLine);
resultData.accumulate("Rebalanced Stats",
CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED);
resultData.accumulate("Value", results.getTotalPrimaryTransfersCompleted());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED + " = "
- + results.getTotalPrimaryTransfersCompleted());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALPRIMARYTRANSFERSCOMPLETED).append(" = ")
+ .append(results.getTotalPrimaryTransfersCompleted()).append(newLine);
resultData.accumulate("Rebalanced Stats", CliStrings.REBALANCE__MSG__TOTALTIME);
resultData.accumulate("Value", results.getTotalTime());
- resultStr.append(CliStrings.REBALANCE__MSG__TOTALTIME + " = " + results.getTotalTime());
- resultStr.append(newLine);
+ resultStr.append(CliStrings.REBALANCE__MSG__TOTALTIME).append(" = ")
+ .append(results.getTotalTime()).append(newLine);
Iterator<PartitionRebalanceInfo> it = regions.iterator();
- String headerText = null;
+ String headerText;
if (simulate) {
headerText = "Simulated partition regions ";
@@ -650,7 +629,7 @@ public class DataCommands implements CommandMarker {
cache.getLogger().info(headerText + resultStr);
}
- return rebalanceResulteData;
+ return rebalanceResultData;
}
public DistributedMember getAssociatedMembers(String region, final InternalCache cache) {
@@ -660,7 +639,7 @@ public class DataCommands implements CommandMarker {
DistributedMember member = null;
if (bean == null) {
- return member;
+ return null;
}
String[] membersName = bean.getMembers();
@@ -670,7 +649,7 @@ public class DataCommands implements CommandMarker {
boolean matchFound = false;
if (membersName.length > 1) {
- while (it.hasNext() && matchFound == false) {
+ while (it.hasNext() && !matchFound) {
DistributedMember dsmember = (DistributedMember) it.next();
for (String memberName : membersName) {
if (MBeanJMXAdapter.getMemberNameOrId(dsmember).equals(memberName)) {
@@ -684,8 +663,9 @@ public class DataCommands implements CommandMarker {
return member;
}
- List<MemberPRInfo> getMemberRegionList(InternalCache cache, List<String> listExcludedRegion) {
- List<MemberPRInfo> listMemberPRInfo = new ArrayList<MemberPRInfo>();
+ private List<MemberPRInfo> getMemberRegionList(InternalCache cache,
+ List<String> listExcludedRegion) {
+ List<MemberPRInfo> listMemberPRInfo = new ArrayList<>();
String[] listDSRegions =
ManagementService.getManagementService(cache).getDistributedSystemMXBean().listRegions();
final Set<DistributedMember> dsMembers = CliUtil.getAllMembers(cache);
@@ -693,11 +673,10 @@ public class DataCommands implements CommandMarker {
for (String regionName : listDSRegions) {
// check for excluded regions
boolean excludedRegionMatch = false;
- Iterator<String> it = listExcludedRegion.iterator();
- while (it.hasNext()) {
+ for (String aListExcludedRegion : listExcludedRegion) {
// this is needed since region name may start with / or without it
// also
- String excludedRegion = it.next().trim();
+ String excludedRegion = aListExcludedRegion.trim();
if (regionName.startsWith("/")) {
if (!excludedRegion.startsWith("/")) {
excludedRegion = "/" + excludedRegion;
@@ -715,7 +694,7 @@ public class DataCommands implements CommandMarker {
}
}
- if (excludedRegionMatch == true) {
+ if (excludedRegionMatch) {
// ignore this region
continue;
}
@@ -773,7 +752,7 @@ public class DataCommands implements CommandMarker {
this.securityService.authorizeRegionRead(regionName);
final DistributedMember targetMember = CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
- Result result = null;
+ Result result;
if (!filePath.endsWith(CliStrings.GEODE_DATA_FILE_EXTENSION)) {
return ResultBuilder.createUserErrorResult(CliStrings
@@ -826,13 +805,12 @@ public class DataCommands implements CommandMarker {
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
optionContext = ConverterHint.MEMBERIDNAME,
help = CliStrings.IMPORT_DATA__MEMBER__HELP) String memberNameOrId,
- @CliOption(key = CliStrings.IMPORT_DATA__INVOKE_CALLBACKS, mandatory = false,
- unspecifiedDefaultValue = "false",
+ @CliOption(key = CliStrings.IMPORT_DATA__INVOKE_CALLBACKS, unspecifiedDefaultValue = "false",
help = CliStrings.IMPORT_DATA__INVOKE_CALLBACKS__HELP) boolean invokeCallbacks) {
this.securityService.authorizeRegionWrite(regionName);
- Result result = null;
+ Result result;
try {
final DistributedMember targetMember = CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
@@ -874,8 +852,7 @@ public class DataCommands implements CommandMarker {
return result;
}
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@CliCommand(value = {CliStrings.PUT}, help = CliStrings.PUT__HELP)
public Result put(
@CliOption(key = {CliStrings.PUT__KEY}, mandatory = true,
@@ -894,26 +871,28 @@ public class DataCommands implements CommandMarker {
this.securityService.authorizeRegionWrite(regionPath);
InternalCache cache = getCache();
- DataCommandResult dataResult = null;
- if (regionPath == null || regionPath.isEmpty()) {
+ DataCommandResult dataResult;
+ if (StringUtils.isEmpty(regionPath)) {
return makePresentationResult(DataCommandResult.createPutResult(key, null, null,
CliStrings.PUT__MSG__REGIONNAME_EMPTY, false));
}
- if (key == null || key.isEmpty())
- return makePresentationResult(dataResult = DataCommandResult.createPutResult(key, null, null,
+ if (StringUtils.isEmpty(key)) {
+ return makePresentationResult(DataCommandResult.createPutResult(key, null, null,
CliStrings.PUT__MSG__KEY_EMPTY, false));
+ }
- if (value == null || value.isEmpty())
- return makePresentationResult(dataResult = DataCommandResult.createPutResult(value, null,
- null, CliStrings.PUT__MSG__VALUE_EMPTY, false));
+ if (StringUtils.isEmpty(value)) {
+ return makePresentationResult(DataCommandResult.createPutResult(value, null, null,
+ CliStrings.PUT__MSG__VALUE_EMPTY, false));
+ }
@SuppressWarnings("rawtypes")
Region region = cache.getRegion(regionPath);
DataCommandFunction putfn = new DataCommandFunction();
if (region == null) {
Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
- if (memberList != null && memberList.size() > 0) {
+ if (CollectionUtils.isNotEmpty(memberList)) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.PUT);
request.setValue(value);
@@ -923,28 +902,30 @@ public class DataCommands implements CommandMarker {
request.setValueClass(valueClass);
request.setPutIfAbsent(putIfAbsent);
dataResult = callFunctionForRegion(request, putfn, memberList);
- } else
+ } else {
dataResult = DataCommandResult.createPutInfoResult(key, value, null,
CliStrings.format(CliStrings.PUT__MSG__REGION_NOT_FOUND_ON_ALL_MEMBERS, regionPath),
false);
+ }
} else {
dataResult = putfn.put(key, value, putIfAbsent, keyClass, valueClass, regionPath);
}
dataResult.setKeyClass(keyClass);
- if (valueClass != null)
+ if (valueClass != null) {
dataResult.setValueClass(valueClass);
+ }
return makePresentationResult(dataResult);
}
private Result makePresentationResult(DataCommandResult dataResult) {
- if (dataResult != null)
+ if (dataResult != null) {
return dataResult.toCommandResult();
- else
+ } else {
return ResultBuilder.createGemFireErrorResult("Error executing data command");
+ }
}
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@CliCommand(value = {CliStrings.GET}, help = CliStrings.GET__HELP)
public Result get(
@CliOption(key = {CliStrings.GET__KEY}, mandatory = true,
@@ -962,23 +943,24 @@ public class DataCommands implements CommandMarker {
this.securityService.authorizeRegionRead(regionPath, key);
InternalCache cache = getCache();
- DataCommandResult dataResult = null;
+ DataCommandResult dataResult;
- if (regionPath == null || regionPath.isEmpty()) {
- return makePresentationResult(dataResult = DataCommandResult.createGetResult(key, null, null,
+ if (StringUtils.isEmpty(regionPath)) {
+ return makePresentationResult(DataCommandResult.createGetResult(key, null, null,
CliStrings.GET__MSG__REGIONNAME_EMPTY, false));
}
- if (key == null || key.isEmpty())
- return makePresentationResult(dataResult = DataCommandResult.createGetResult(key, null, null,
+ if (StringUtils.isEmpty(key)) {
+ return makePresentationResult(DataCommandResult.createGetResult(key, null, null,
CliStrings.GET__MSG__KEY_EMPTY, false));
+ }
@SuppressWarnings("rawtypes")
Region region = cache.getRegion(regionPath);
DataCommandFunction getfn = new DataCommandFunction();
if (region == null) {
Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
- if (memberList != null && memberList.size() > 0) {
+ if (CollectionUtils.isNotEmpty(memberList)) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.GET);
request.setKey(key);
@@ -988,25 +970,26 @@ public class DataCommands implements CommandMarker {
request.setLoadOnCacheMiss(loadOnCacheMiss);
Subject subject = this.securityService.getSubject();
if (subject != null) {
- request.setPrincipal((Serializable) subject.getPrincipal());
+ request.setPrincipal(subject.getPrincipal());
}
dataResult = callFunctionForRegion(request, getfn, memberList);
- } else
+ } else {
dataResult = DataCommandResult.createGetInfoResult(key, null, null,
CliStrings.format(CliStrings.GET__MSG__REGION_NOT_FOUND_ON_ALL_MEMBERS, regionPath),
false);
+ }
} else {
dataResult = getfn.get(null, key, keyClass, valueClass, regionPath, loadOnCacheMiss);
}
dataResult.setKeyClass(keyClass);
- if (valueClass != null)
+ if (valueClass != null) {
dataResult.setValueClass(valueClass);
+ }
return makePresentationResult(dataResult);
}
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@CliCommand(value = {CliStrings.LOCATE_ENTRY}, help = CliStrings.LOCATE_ENTRY__HELP)
public Result locateEntry(
@CliOption(key = {CliStrings.LOCATE_ENTRY__KEY}, mandatory = true,
@@ -1024,20 +1007,21 @@ public class DataCommands implements CommandMarker {
this.securityService.authorizeRegionRead(regionPath, key);
- DataCommandResult dataResult = null;
+ DataCommandResult dataResult;
- if (regionPath == null || regionPath.isEmpty()) {
- return makePresentationResult(dataResult = DataCommandResult.createLocateEntryResult(key,
- null, null, CliStrings.LOCATE_ENTRY__MSG__REGIONNAME_EMPTY, false));
+ if (StringUtils.isEmpty(regionPath)) {
+ return makePresentationResult(DataCommandResult.createLocateEntryResult(key, null, null,
+ CliStrings.LOCATE_ENTRY__MSG__REGIONNAME_EMPTY, false));
}
- if (key == null || key.isEmpty())
- return makePresentationResult(dataResult = DataCommandResult.createLocateEntryResult(key,
- null, null, CliStrings.LOCATE_ENTRY__MSG__KEY_EMPTY, false));
+ if (StringUtils.isEmpty(key)) {
+ return makePresentationResult(DataCommandResult.createLocateEntryResult(key, null, null,
+ CliStrings.LOCATE_ENTRY__MSG__KEY_EMPTY, false));
+ }
DataCommandFunction locateEntry = new DataCommandFunction();
Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), true);
- if (memberList != null && memberList.size() > 0) {
+ if (CollectionUtils.isNotEmpty(memberList)) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.LOCATE_ENTRY);
request.setKey(key);
@@ -1046,18 +1030,19 @@ public class DataCommands implements CommandMarker {
request.setValueClass(valueClass);
request.setRecursive(recursive);
dataResult = callFunctionForRegion(request, locateEntry, memberList);
- } else
+ } else {
dataResult = DataCommandResult.createLocateEntryInfoResult(key, null, null, CliStrings.format(
CliStrings.LOCATE_ENTRY__MSG__REGION_NOT_FOUND_ON_ALL_MEMBERS, regionPath), false);
+ }
dataResult.setKeyClass(keyClass);
- if (valueClass != null)
+ if (valueClass != null) {
dataResult.setValueClass(valueClass);
+ }
return makePresentationResult(dataResult);
}
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@CliCommand(value = {CliStrings.REMOVE}, help = CliStrings.REMOVE__HELP)
public Result remove(
@CliOption(key = {CliStrings.REMOVE__KEY}, help = CliStrings.REMOVE__KEY__HELP,
@@ -1070,16 +1055,16 @@ public class DataCommands implements CommandMarker {
@CliOption(key = {CliStrings.REMOVE__KEYCLASS},
help = CliStrings.REMOVE__KEYCLASS__HELP) String keyClass) {
InternalCache cache = getCache();
- DataCommandResult dataResult = null;
+ DataCommandResult dataResult;
- if (regionPath == null || regionPath.isEmpty()) {
- return makePresentationResult(dataResult = DataCommandResult.createRemoveResult(key, null,
- null, CliStrings.REMOVE__MSG__REGIONNAME_EMPTY, false));
+ if (StringUtils.isEmpty(regionPath)) {
+ return makePresentationResult(DataCommandResult.createRemoveResult(key, null, null,
+ CliStrings.REMOVE__MSG__REGIONNAME_EMPTY, false));
}
if (!removeAllKeys && (key == null)) {
- return makePresentationResult(dataResult = DataCommandResult.createRemoveResult(key, null,
- null, CliStrings.REMOVE__MSG__KEY_EMPTY, false));
+ return makePresentationResult(DataCommandResult.createRemoveResult(null, null, null,
+ CliStrings.REMOVE__MSG__KEY_EMPTY, false));
}
if (removeAllKeys) {
@@ -1093,7 +1078,7 @@ public class DataCommands implements CommandMarker {
DataCommandFunction removefn = new DataCommandFunction();
if (region == null) {
Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
- if (memberList != null && memberList.size() > 0) {
+ if (CollectionUtils.isNotEmpty(memberList)) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.REMOVE);
request.setKey(key);
@@ -1101,10 +1086,11 @@ public class DataCommands implements CommandMarker {
request.setRemoveAllKeys(removeAllKeys ? "ALL" : null);
request.setRegionName(regionPath);
dataResult = callFunctionForRegion(request, removefn, memberList);
- } else
+ } else {
dataResult = DataCommandResult.createRemoveInfoResult(key, null, null,
CliStrings.format(CliStrings.REMOVE__MSG__REGION_NOT_FOUND_ON_ALL_MEMBERS, regionPath),
false);
+ }
} else {
dataResult = removefn.remove(key, keyClass, regionPath, removeAllKeys ? "ALL" : null);
@@ -1114,17 +1100,15 @@ public class DataCommands implements CommandMarker {
return makePresentationResult(dataResult);
}
- @CliMetaData(shellOnly = false,
- relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
+ @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@MultiStepCommand
@CliCommand(value = {CliStrings.QUERY}, help = CliStrings.QUERY__HELP)
public Object query(
@CliOption(key = CliStrings.QUERY__QUERY, help = CliStrings.QUERY__QUERY__HELP,
mandatory = true) final String query,
- @CliOption(key = CliStrings.QUERY__STEPNAME, mandatory = false, help = "Step name",
+ @CliOption(key = CliStrings.QUERY__STEPNAME, help = "Step name",
unspecifiedDefaultValue = CliStrings.QUERY__STEPNAME__DEFAULTVALUE) String stepName,
- @CliOption(key = CliStrings.QUERY__INTERACTIVE, mandatory = false,
- help = CliStrings.QUERY__INTERACTIVE__HELP,
+ @CliOption(key = CliStrings.QUERY__INTERACTIVE, help = CliStrings.QUERY__INTERACTIVE__HELP,
unspecifiedDefaultValue = "true") final boolean interactive) {
if (!CliUtil.isGfshVM() && stepName.equals(CliStrings.QUERY__STEPNAME__DEFAULTVALUE)) {
@@ -1156,18 +1140,12 @@ public class DataCommands implements CommandMarker {
public String region;
public MemberPRInfo() {
- region = new String();
- dsMemberList = new ArrayList<DistributedMember>();
+ region = "";
+ dsMemberList = new ArrayList<>();
}
public boolean equals(Object o2) {
- if (o2 == null) {
- return false;
- }
- if (this.region.equals(((MemberPRInfo) o2).region)) {
- return true;
- }
- return false;
+ return o2 != null && this.region.equals(((MemberPRInfo) o2).region);
}
}
@@ -1196,8 +1174,7 @@ public class DataCommands implements CommandMarker {
FunctionService.onMembers(members).setArguments(request).execute(putfn);
List list = (List) collector.getResult();
DataCommandResult result = null;
- for (int i = 0; i < list.size(); i++) {
- Object object = list.get(i);
+ for (Object object : list) {
if (object instanceof Throwable) {
Throwable error = (Throwable) object;
result = new DataCommandResult();
@@ -1220,42 +1197,45 @@ public class DataCommands implements CommandMarker {
public static Set<DistributedMember> getQueryRegionsAssociatedMembers(Set<String> regions,
final InternalCache cache, boolean returnAll) {
LogWriter logger = cache.getLogger();
- Set<DistributedMember> members = null;
+ Set<DistributedMember> members;
Set<DistributedMember> newMembers = null;
Iterator<String> iterator = regions.iterator();
- String region = (String) iterator.next();
+ String region = iterator.next();
members = getRegionAssociatedMembers(region, cache, true);
- if (logger.fineEnabled())
+ if (logger.fineEnabled()) {
logger.fine("Members for region " + region + " Members " + members);
- List<String> regionAndingList = new ArrayList<String>();
+ }
+ List<String> regionAndingList = new ArrayList<>();
regionAndingList.add(region);
if (regions.size() == 1) {
newMembers = members;
} else {
- if (members != null && !members.isEmpty()) {
+ if (CollectionUtils.isNotEmpty(members)) {
while (iterator.hasNext()) {
region = iterator.next();
newMembers = getRegionAssociatedMembers(region, cache, true);
if (newMembers == null) {
- newMembers = new HashSet<DistributedMember>();
+ newMembers = new HashSet<>();
}
- if (logger.fineEnabled())
+ if (logger.fineEnabled()) {
logger.fine("Members for region " + region + " Members " + newMembers);
+ }
regionAndingList.add(region);
newMembers.retainAll(members);
members = newMembers;
- if (logger.fineEnabled())
+ if (logger.fineEnabled()) {
logger.fine(
"Members after anding for regions " + regionAndingList + " List : " + newMembers);
+ }
}
}
}
- members = new HashSet<DistributedMember>();
- if (newMembers == null)
+ members = new HashSet<>();
+ if (newMembers == null) {
return members;
- Iterator<DistributedMember> memberIterator = newMembers.iterator();
- while (memberIterator.hasNext()) {
- members.add(memberIterator.next());
+ }
+ for (DistributedMember newMember : newMembers) {
+ members.add(newMember);
if (!returnAll) {
return members;
}
@@ -1267,17 +1247,20 @@ public class DataCommands implements CommandMarker {
public static Set<DistributedMember> getRegionAssociatedMembers(String region,
final InternalCache cache, boolean returnAll) {
- DistributedMember member = null;
+ DistributedMember member;
- if (region == null || region.isEmpty())
+ if (StringUtils.isEmpty(region)) {
return null;
+ }
DistributedRegionMXBean bean =
ManagementService.getManagementService(cache).getDistributedRegionMXBean(region);
- if (bean == null)// try with slash ahead
+ if (bean == null) {
+ // try with slash ahead
bean = ManagementService.getManagementService(cache)
.getDistributedRegionMXBean(Region.SEPARATOR + region);
+ }
if (bean == null) {
return null;
@@ -1285,11 +1268,11 @@ public class DataCommands implements CommandMarker {
String[] membersName = bean.getMembers();
Set<DistributedMember> dsMembers = cache.getMembers();
- Set<DistributedMember> dsMembersWithThisMember = new HashSet<DistributedMember>();
+ Set<DistributedMember> dsMembersWithThisMember = new HashSet<>();
dsMembersWithThisMember.addAll(dsMembers);
dsMembersWithThisMember.add(cache.getDistributedSystem().getDistributedMember());
Iterator it = dsMembersWithThisMember.iterator();
- Set<DistributedMember> matchedMembers = new HashSet<DistributedMember>();
+ Set<DistributedMember> matchedMembers = new HashSet<>();
if (membersName.length > 0) {
while (it.hasNext()) {
@@ -1321,11 +1304,13 @@ public class DataCommands implements CommandMarker {
int replacedVars = 0;
while (!done) {
int index1 = query.indexOf("${", startIndex);
- if (index1 == -1)
+ if (index1 == -1) {
break;
+ }
int index2 = query.indexOf("}", index1);
- if (index2 == -1)
+ if (index2 == -1) {
break;
+ }
String var = query.substring(index1 + 2, index2);
String value = gfshEnvVarMap.get(var);
if (value != null) {
@@ -1333,8 +1318,9 @@ public class DataCommands implements CommandMarker {
replacedVars++;
}
startIndex = index2 + 1;
- if (startIndex >= query.length())
+ if (startIndex >= query.length()) {
done = true;
+ }
}
return new Object[] {replacedVars, query};
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
index 423d781..fe88fc9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java
@@ -17,14 +17,7 @@ package org.apache.geode.management.internal.cli.domain;
import static org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper.createBannerResult;
import static org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper.createPageResult;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.management.cli.Result;
@@ -38,20 +31,28 @@ import org.apache.geode.management.internal.cli.result.CompositeResultData.Secti
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.management.internal.cli.util.JsonUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.json.JSONObject;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
/**
- * Domain object used for Data Commands Functions
- *
- * TODO : Implement DataSerializable
- *
+ * Domain object used for Data Commands Functions TODO : Implement DataSerializable
*/
public class DataCommandResult implements /* Data */ Serializable {
- /**
- *
- */
+ private static Logger logger = LogManager.getLogger();
+
private static final long serialVersionUID = 1L;
private String command;
private Object putResult;
@@ -66,7 +67,9 @@ public class DataCommandResult implements /* Data */ Serializable {
public static final String RESULT_FLAG = "Result";
public static final String NUM_ROWS = "Rows";
- // Aggreagated Data.
+ public static final String MISSING_VALUE = "<NULL>";
+
+ // Aggregated Data.
private List<KeyInfo> locateEntryLocations;
private KeyInfo locateEntryResult;
private boolean hasResultForAggregation;
@@ -91,21 +94,24 @@ public class DataCommandResult implements /* Data */ Serializable {
if (isGet()) {
sb.append(" Type : Get").append(NEW_LINE);
sb.append(" Key : ").append(inputKey).append(NEW_LINE);
- if (getResult != null)
+ if (getResult != null) {
sb.append(" ReturnValue Class : ").append(getResult.getClass()).append(NEW_LINE);
+ }
sb.append(" ReturnValue : ").append(getResult).append(NEW_LINE);
} else if (isPut()) {
sb.append(" Type : Put");
sb.append(" Key : ").append(inputKey).append(NEW_LINE);
- if (putResult != null)
+ if (putResult != null) {
sb.append(" ReturnValue Class : ").append(putResult.getClass()).append(NEW_LINE);
+ }
sb.append(" ReturnValue : ").append(putResult).append(NEW_LINE);
sb.append(" Value : ").append(inputValue).append(NEW_LINE);
} else if (isRemove()) {
sb.append(" Type : Remove");
sb.append(" Key : ").append(inputKey).append(NEW_LINE);
- if (removeResult != null)
+ if (removeResult != null) {
sb.append(" ReturnValue Class : ").append(removeResult.getClass()).append(NEW_LINE);
+ }
sb.append(" ReturnValue : ").append(removeResult).append(NEW_LINE);
} else if (isLocateEntry()) {
sb.append(" Type : Locate Entry");
@@ -114,45 +120,31 @@ public class DataCommandResult implements /* Data */ Serializable {
sb.append(" Results : ").append(locateEntryResult).append(NEW_LINE);
sb.append(" Locations : ").append(locateEntryLocations).append(NEW_LINE);
}
- if (errorString != null)
+ if (errorString != null) {
sb.append(" ERROR ").append(errorString);
+ }
return sb.toString();
}
public boolean isGet() {
- if (CliStrings.GET.equals(command))
- return true;
- else
- return false;
+ return CliStrings.GET.equals(command);
}
public boolean isPut() {
- if (CliStrings.PUT.equals(command))
- return true;
- else
- return false;
+ return CliStrings.PUT.equals(command);
}
public boolean isRemove() {
- if (CliStrings.REMOVE.equals(command))
- return true;
- else
- return false;
+ return CliStrings.REMOVE.equals(command);
}
public boolean isLocateEntry() {
- if (CliStrings.LOCATE_ENTRY.equals(command))
- return true;
- else
- return false;
+ return CliStrings.LOCATE_ENTRY.equals(command);
}
public boolean isSelect() {
- if (CliStrings.QUERY.equals(command))
- return true;
- else
- return false;
+ return CliStrings.QUERY.equals(command);
}
public List<SelectResultRow> getSelectResult() {
@@ -393,11 +385,13 @@ public class DataCommandResult implements /* Data */ Serializable {
public Result toCommandResult() {
- if (keyClass == null || keyClass.isEmpty())
+ if (StringUtils.isEmpty(keyClass)) {
keyClass = "java.lang.String";
+ }
- if (valueClass == null || valueClass.isEmpty())
+ if (StringUtils.isEmpty(valueClass)) {
valueClass = "java.lang.String";
+ }
if (errorString != null) {
// return ResultBuilder.createGemFireErrorResult(errorString);
@@ -406,124 +400,140 @@ public class DataCommandResult implements /* Data */ Serializable {
section.addData("Message", errorString);
section.addData(RESULT_FLAG, operationCompletedSuccessfully);
return ResultBuilder.buildResult(data);
+ }
+
+ CompositeResultData data = ResultBuilder.createCompositeResultData();
+ SectionResultData section = data.addSection();
+ TabularResultData table = section.addTable();
+
+ section.addData(RESULT_FLAG, operationCompletedSuccessfully);
+ if (infoString != null) {
+ section.addData("Message", infoString);
+ }
+
+ if (isGet()) {
+ toCommandResult_isGet(section, table);
+ } else if (isLocateEntry()) {
+ toCommandResult_isLocate(section, table);
+ } else if (isPut()) {
+ toCommandResult_isPut(section, table);
+ } else if (isRemove()) {
+ toCommandResult_isRemove(section, table);
+ } else if (isSelect()) {
+ // its moved to its separate method
+ }
+ return ResultBuilder.buildResult(data);
+ }
+
+ private void toCommandResult_isGet(SectionResultData section, TabularResultData table) {
+ section.addData("Key Class", getKeyClass());
+ if (!isDeclaredPrimitive(keyClass)) {
+ addJSONStringToTable(table, inputKey);
} else {
- CompositeResultData data = ResultBuilder.createCompositeResultData();
- SectionResultData section = data.addSection();
- TabularResultData table = section.addTable();
+ section.addData("Key", inputKey);
+ }
- section.addData(RESULT_FLAG, operationCompletedSuccessfully);
- if (infoString != null)
- section.addData("Message", infoString);
+ section.addData("Value Class", getValueClass());
+ if (!isDeclaredPrimitive(valueClass)) {
+ addJSONStringToTable(table, getResult);
+ } else {
+ section.addData("Value", getResult);
+ }
+ }
- if (isGet()) {
-
- section.addData("Key Class", getKeyClass());
- if (!isDeclaredPrimitive(keyClass))
- addJSONStringToTable(table, inputKey);
- else
- section.addData("Key", inputKey);
-
- section.addData("Value Class", getValueClass());
- if (!isDeclaredPrimitive(valueClass))
- addJSONStringToTable(table, getResult);
- else
- section.addData("Value", getResult);
-
-
- } else if (isLocateEntry()) {
-
- section.addData("Key Class", getKeyClass());
- if (!isDeclaredPrimitive(keyClass))
- addJSONStringToTable(table, inputKey);
- else
- section.addData("Key", inputKey);
-
- if (locateEntryLocations != null) {
- TabularResultData locationTable = section.addTable();
-
- int totalLocations = 0;
-
- for (KeyInfo info : locateEntryLocations) {
- List<Object[]> locations = info.getLocations();
-
- if (locations != null) {
- if (locations.size() == 1) {
- Object array[] = locations.get(0);
- // String regionPath = (String)array[0];
- boolean found = (Boolean) array[1];
- if (found) {
- totalLocations++;
- boolean primary = (Boolean) array[3];
- String bucketId = (String) array[4];
- locationTable.accumulate("MemberName", info.getMemberName());
- locationTable.accumulate("MemberId", info.getMemberId());
- if (bucketId != null) {// PR
- if (primary)
- locationTable.accumulate("Primary", "*Primary PR*");
- else
- locationTable.accumulate("Primary", "No");
- locationTable.accumulate("BucketId", bucketId);
- }
+ private void toCommandResult_isLocate(SectionResultData section, TabularResultData table) {
+
+ section.addData("Key Class", getKeyClass());
+ if (!isDeclaredPrimitive(keyClass)) {
+ addJSONStringToTable(table, inputKey);
+ } else {
+ section.addData("Key", inputKey);
+ }
+
+ if (locateEntryLocations != null) {
+ TabularResultData locationTable = section.addTable();
+
+ int totalLocations = 0;
+
+ for (KeyInfo info : locateEntryLocations) {
+ List<Object[]> locations = info.getLocations();
+
+ if (locations != null) {
+ if (locations.size() == 1) {
+ Object array[] = locations.get(0);
+ // String regionPath = (String)array[0];
+ boolean found = (Boolean) array[1];
+ if (found) {
+ totalLocations++;
+ boolean primary = (Boolean) array[3];
+ String bucketId = (String) array[4];
+ locationTable.accumulate("MemberName", info.getMemberName());
+ locationTable.accumulate("MemberId", info.getMemberId());
+ if (bucketId != null) {// PR
+ if (primary) {
+ locationTable.accumulate("Primary", "*Primary PR*");
+ } else {
+ locationTable.accumulate("Primary", "No");
}
- } else {
- for (Object[] array : locations) {
- String regionPath = (String) array[0];
- boolean found = (Boolean) array[1];
- if (found) {
- totalLocations++;
- boolean primary = (Boolean) array[3];
- String bucketId = (String) array[4];
- locationTable.accumulate("MemberName", info.getMemberName());
- locationTable.accumulate("MemberId", info.getMemberId());
- locationTable.accumulate("RegionPath", regionPath);
- if (bucketId != null) {// PR
- if (primary)
- locationTable.accumulate("Primary", "*Primary PR*");
- else
- locationTable.accumulate("Primary", "No");
- locationTable.accumulate("BucketId", bucketId);
- }
+ locationTable.accumulate("BucketId", bucketId);
+ }
+ }
+ } else {
+ for (Object[] array : locations) {
+ String regionPath = (String) array[0];
+ boolean found = (Boolean) array[1];
+ if (found) {
+ totalLocations++;
+ boolean primary = (Boolean) array[3];
+ String bucketId = (String) array[4];
+ locationTable.accumulate("MemberName", info.getMemberName());
+ locationTable.accumulate("MemberId", info.getMemberId());
+ locationTable.accumulate("RegionPath", regionPath);
+ if (bucketId != null) {// PR
+ if (primary) {
+ locationTable.accumulate("Primary", "*Primary PR*");
+ } else {
+ locationTable.accumulate("Primary", "No");
}
+ locationTable.accumulate("BucketId", bucketId);
}
}
}
}
- section.addData("Locations Found", totalLocations);
- } else {
- section.addData("Location Info ", "Could not find location information");
}
+ }
+ section.addData("Locations Found", totalLocations);
+ } else {
+ section.addData("Location Info ", "Could not find location information");
+ }
+ }
- } else if (isPut()) {
- section.addData("Key Class", getKeyClass());
-
- if (!isDeclaredPrimitive(keyClass)) {
- addJSONStringToTable(table, inputKey);
- } else
- section.addData("Key", inputKey);
-
- section.addData("Value Class", getValueClass());
- if (!isDeclaredPrimitive(valueClass)) {
- addJSONStringToTable(table, putResult);
- } else
- section.addData("Old Value", putResult);
-
- } else if (isRemove()) {
- if (inputKey != null) {// avoids printing key when remove ALL is called
- section.addData("Key Class", getKeyClass());
- if (!isDeclaredPrimitive(keyClass))
- addJSONStringToTable(table, inputKey);
- else
- section.addData("Key", inputKey);
- }
- /*
- * if(valueClass!=null && !valueClass.isEmpty()){ section.addData("Value Class",
- * getValueClass()); addJSONStringToTable(table,removeResult); }else
- * section.addData("Value", removeResult);
- */
- } else if (isSelect()) {
- // its moved to its separate method
+ private void toCommandResult_isPut(SectionResultData section, TabularResultData table) {
+ section.addData("Key Class", getKeyClass());
+
+ if (!isDeclaredPrimitive(keyClass)) {
+ addJSONStringToTable(table, inputKey);
+ } else {
+ section.addData("Key", inputKey);
+ }
+
+ section.addData("Value Class", getValueClass());
+ if (!isDeclaredPrimitive(valueClass)) {
+ addJSONStringToTable(table, putResult);
+ } else {
+ section.addData("Old Value", putResult);
+ }
+
+ }
+
+ private void toCommandResult_isRemove(SectionResultData section, TabularResultData table) {
+ if (inputKey != null) {// avoids printing key when remove ALL is called
+ section.addData("Key Class", getKeyClass());
+ if (!isDeclaredPrimitive(keyClass)) {
+ addJSONStringToTable(table, inputKey);
+ } else {
+ section.addData("Key", inputKey);
}
- return ResultBuilder.buildResult(data);
}
}
@@ -555,8 +565,9 @@ public class DataCommandResult implements /* Data */ Serializable {
}
if (this.selectResult != null) {
section.addData(NUM_ROWS, this.selectResult.size());
- if (this.queryTraceString != null)
+ if (this.queryTraceString != null) {
section.addData("Query Trace", this.queryTraceString);
+ }
buildTable(table, 0, selectResult.size());
}
}
@@ -570,7 +581,7 @@ public class DataCommandResult implements /* Data */ Serializable {
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public Result pageResult(int startCount, int endCount, String step) {
- List<String> fields = new ArrayList<String>();
+ List<String> fields = new ArrayList<>();
List values = new ArrayList<String>();
fields.add(RESULT_FLAG);
values.add(operationCompletedSuccessfully);
@@ -592,8 +603,8 @@ public class DataCommandResult implements /* Data */ Serializable {
if (selectResult != null) {
try {
TabularResultData table = ResultBuilder.createTabularResultData();
- String[] headers = null;
- Object[][] rows = null;
+ String[] headers;
+ Object[][] rows;
int rowCount = buildTable(table, startCount, endCount);
GfJsonArray array = table.getHeaders();
headers = new String[array.size()];
@@ -619,36 +630,70 @@ public class DataCommandResult implements /* Data */ Serializable {
Object valuesArray[] = {startCount, endCount};
return createPageResult(fieldsArray, valuesArray, step, headers, rows);
}
- } else
+ } else {
return createBannerResult(fields, values, step);
+ }
}
}
private int buildTable(TabularResultData table, int startCount, int endCount) {
- int rowCount = 0;
- // Introspect first using tabular data
- for (int i = startCount; i <= endCount; i++) {
- if (i >= selectResult.size())
- break;
- else
- rowCount++;
-
- SelectResultRow row = selectResult.get(i);
- switch (row.type) {
- case ROW_TYPE_BEAN:
- addJSONStringToTable(table, row.value);
- break;
- case ROW_TYPE_STRUCT_RESULT:
- addJSONStringToTable(table, row.value);
- break;
- case ROW_TYPE_PRIMITIVE:
- table.accumulate(RESULT_FLAG, row.value);
- break;
+ // Three steps:
+ // 1a. Convert each row object to a Json object.
+ // 1b. Build a list of keys that are used for each object
+ // 2. Pad MISSING_VALUE into Json objects for those data that are missing any particular key
+ // 3. Build the table from these Json objects.
+
+ // 1.
+ int lastRowExclusive = Math.min(selectResult.size(), endCount + 1);
+ List<SelectResultRow> paginatedRows = selectResult.subList(startCount, lastRowExclusive);
+
+ List<GfJsonObject> tableRows = new ArrayList<>();
+ List<GfJsonObject> rowsWithRealJsonObjects = new ArrayList<>();
+ Set<String> columns = new HashSet<>();
+
+ for (SelectResultRow row : paginatedRows) {
+ GfJsonObject object = new GfJsonObject();
+ try {
+ if (row.value == null || MISSING_VALUE.equals(row.value)) {
+ object.put("Value", MISSING_VALUE);
+ } else if (row.type == ROW_TYPE_PRIMITIVE) {
+ object.put(RESULT_FLAG, row.value);
+ } else {
+ object = buildGfJsonFromRawObject(row.value);
+ rowsWithRealJsonObjects.add(object);
+ object.keys().forEachRemaining(columns::add);
+ }
+ tableRows.add(object);
+ } catch (GfJsonException e) {
+ JSONObject errJson =
+ new JSONObject().put("Value", "Error getting bean properties " + e.getMessage());
+ tableRows.add(new GfJsonObject(errJson, false));
}
}
- return rowCount;
+
+ // 2.
+ for (GfJsonObject tableRow : rowsWithRealJsonObjects) {
+ for (String key : columns) {
+ if (!tableRow.has(key)) {
+ try {
+ tableRow.put(key, MISSING_VALUE);
+ } catch (GfJsonException e) {
+ // TODO: Address this unlikely possibility.
+ logger.warn("Ignored GfJsonException:", e);
+ }
+ }
+ }
+ }
+
+ // 3.
+ for (GfJsonObject jsonObject : tableRows) {
+ addJSONObjectToTable(table, jsonObject);
+ }
+
+ return paginatedRows.size();
}
+
private boolean isDeclaredPrimitive(String keyClass2) {
try {
Class klass = ClassPathLoader.getLatest().forName(keyClass2);
@@ -658,45 +703,6 @@ public class DataCommandResult implements /* Data */ Serializable {
}
}
- private void addJSONStringToTable(TabularResultData table, Object object) {
- if (object == null || "<NULL>".equals(object)) {
- table.accumulate("Value", "<NULL>");
- } else {
- try {
- Class klass = object.getClass();
- GfJsonObject jsonObject = null;
- if (String.class.equals(klass)) {
- // InputString in JSON Form but with round brackets
- String json = (String) object;
- String newString = json.replaceAll("'", "\"");
- if (newString.charAt(0) == '(') {
- int len = newString.length();
- StringBuilder sb = new StringBuilder();
- sb.append("{").append(newString.substring(1, len - 1)).append("}");
- newString = sb.toString();
- }
- jsonObject = new GfJsonObject(newString);
- } else {
- jsonObject = new GfJsonObject(object, true);
- }
-
- Iterator<String> keys = jsonObject.keys();
- while (keys.hasNext()) {
- String k = keys.next();
- // filter out meta-field type-class used to identify java class of json obbject
- if (!"type-class".equals(k)) {
- Object value = jsonObject.get(k);
- if (value != null) {
- table.accumulate(k, getDomainValue(value));
- }
- }
- }
- } catch (Exception e) {
- table.accumulate("Value", "Error getting bean properties " + e.getMessage());
- }
- }
- }
-
private Object getDomainValue(Object value) {
if (value instanceof String) {
@@ -708,8 +714,9 @@ public class DataCommandResult implements /* Data */ Serializable {
} catch (Exception e) {
return str;
}
- } else
+ } else {
return str;
+ }
}
return value;
}
@@ -722,7 +729,6 @@ public class DataCommandResult implements /* Data */ Serializable {
this.inputQuery = inputQuery;
}
-
public static class KeyInfo implements /* Data */ Serializable {
private String memberId;
@@ -734,8 +740,9 @@ public class DataCommandResult implements /* Data */ Serializable {
private ArrayList<Object[]> locations = null;
public void addLocation(Object[] locationArray) {
- if (this.locations == null)
- locations = new ArrayList<Object[]>();
+ if (this.locations == null) {
+ locations = new ArrayList<>();
+ }
locations.add(locationArray);
}
@@ -790,13 +797,14 @@ public class DataCommandResult implements /* Data */ Serializable {
}
public boolean hasLocation() {
- if (locations == null)
+ if (locations == null) {
return false;
- else {
+ } else {
for (Object[] array : locations) {
boolean found = (Boolean) array[1];
- if (found)
+ if (found) {
return true;
+ }
}
}
return false;
@@ -823,7 +831,6 @@ public class DataCommandResult implements /* Data */ Serializable {
}
}
-
public static final int ROW_TYPE_STRUCT_RESULT = 100;
public static final int ROW_TYPE_BEAN = 200;
public static final int ROW_TYPE_PRIMITIVE = 300;
@@ -856,45 +863,98 @@ public class DataCommandResult implements /* Data */ Serializable {
}
+
public void aggregate(DataCommandResult result) {
- if (isLocateEntry()) {
- /* Right now only called for LocateEntry */
+ /* Right now only called for LocateEntry */
+ if (!isLocateEntry()) {
+ return;
+ }
- if (this.locateEntryLocations == null) {
- locateEntryLocations = new ArrayList<KeyInfo>();
- }
+ if (this.locateEntryLocations == null) {
+ locateEntryLocations = new ArrayList<>();
+ }
- if (result == null) {// self-transform result from single to aggregate when numMember==1
- if (this.locateEntryResult != null) {
- locateEntryLocations.add(locateEntryResult);
- // TODO : Decide whether to show value or not this.getResult =
- // locateEntryResult.getValue();
- }
- return;
+ if (result == null) {// self-transform result from single to aggregate when numMember==1
+ if (this.locateEntryResult != null) {
+ locateEntryLocations.add(locateEntryResult);
+ // TODO : Decide whether to show value or not this.getResult = locateEntryResult.getValue();
}
+ return;
+ }
+
+ if (result.errorString != null && !result.errorString.equals(errorString)) {
+ // append errorString only if differs
+ errorString = result.errorString + " " + errorString;
+ }
+
+ // append message only when it differs for negative results
+ if (!operationCompletedSuccessfully && result.infoString != null
+ && !result.infoString.equals(infoString)) {
+ infoString = result.infoString;
+ }
- if (result.errorString != null && !result.errorString.equals(errorString)) {
- // append errorString only if differs
- String newString = result.errorString + " " + errorString;
- errorString = newString;
+ if (result.hasResultForAggregation) {
+ this.operationCompletedSuccessfully = true;
+ infoString = result.infoString;
+ if (result.locateEntryResult != null) {
+ locateEntryLocations.add(result.locateEntryResult);
}
+ }
+ }
- // append messsage only when it differs for negative results
- if (!operationCompletedSuccessfully && result.infoString != null
- && !result.infoString.equals(infoString)) {
- infoString = result.infoString;
+
+ private void addJSONObjectToTable(TabularResultData table, GfJsonObject object) {
+ Iterator<String> keys;
+
+ keys = object.keys();
+ while (keys.hasNext()) {
+ String k = keys.next();
+ // filter out meta-field type-class used to identify java class of json object
+ if (!"type-class".equals(k)) {
+ Object value = object.get(k);
+
+ if (value != null) {
+ table.accumulate(k, getDomainValue(value));
+ }
}
+ }
+ }
+
+ private GfJsonObject buildGfJsonFromRawObject(Object object) throws GfJsonException {
+ GfJsonObject jsonObject;
+ if (String.class.equals(object.getClass())) {
+ jsonObject = new GfJsonObject(sanitizeJsonString((String) object));
+ } else {
+ jsonObject = new GfJsonObject(object, true);
+ }
+
+ return jsonObject;
+ }
+
+ private String sanitizeJsonString(String s) {
+ // InputString in JSON Form but with round brackets
+ String newString = s.replaceAll("'", "\"");
+ if (newString.charAt(0) == '(') {
+ int len = newString.length();
+ newString = "{" + newString.substring(1, len - 1) + "}";
+ }
+ return newString;
+ }
- if (result.hasResultForAggregation /* && result.errorString==null */) {
- this.operationCompletedSuccessfully = true;// override this
- // result.operationCompletedSuccessfully
- infoString = result.infoString;
- if (result.locateEntryResult != null)
- locateEntryLocations.add(result.locateEntryResult);
+ private void addJSONStringToTable(TabularResultData table, Object object) {
+ if (object == null || MISSING_VALUE.equals(object)) {
+ table.accumulate("Value", MISSING_VALUE);
+ } else {
+ try {
+ GfJsonObject jsonObject = buildGfJsonFromRawObject(object);
+ addJSONObjectToTable(table, jsonObject);
+ } catch (Exception e) {
+ table.accumulate("Value", "Error getting bean properties " + e.getMessage());
}
}
}
+
// @Override
public void toData(DataOutput out) throws IOException {
DataSerializer.writeString(command, out);
@@ -935,5 +995,3 @@ public class DataCommandResult implements /* Data */ Serializable {
}
}
-
-
[07/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java
index 52e1c57..60ac459 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java
@@ -15,50 +15,78 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -67,6 +95,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -98,13 +127,19 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -120,7 +155,9 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -144,7 +181,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -155,114 +192,118 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -279,6 +320,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -296,6 +338,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -325,6 +368,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -357,13 +401,16 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -376,5 +423,8 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java
index b2181d0..51347e0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java
@@ -15,39 +15,65 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntryHeap {
- public VersionedThinRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VersionedThinRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +81,11 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +105,7 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,18 +116,21 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -117,6 +147,7 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -134,6 +165,7 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -163,6 +195,7 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -195,12 +228,17 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -211,5 +249,8 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java
index 901e64d..0269e67 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java
@@ -15,39 +15,65 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntryHeap {
- public VersionedThinRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VersionedThinRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,10 +81,11 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +105,7 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,18 +116,21 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -117,6 +147,7 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -134,6 +165,7 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -163,6 +195,7 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -195,12 +228,15 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -211,5 +247,8 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java
index 27fb4bd..f4bfa8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java
@@ -15,40 +15,65 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEntryHeap {
public VersionedThinRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +82,11 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +106,7 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,18 +117,21 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -119,6 +148,7 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -136,6 +166,7 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -165,6 +196,7 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -197,13 +229,19 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java
index 05d32cb..0ad5265 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java
@@ -15,36 +15,57 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionEntryHeap {
public VersionedThinRegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -63,9 +84,11 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -74,10 +97,11 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -97,7 +121,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -108,18 +132,21 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -136,6 +163,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -153,6 +181,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -182,6 +211,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -214,8 +244,11 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -229,7 +262,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -248,6 +281,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -277,5 +311,8 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java
index 68e9a61..2d8817b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java
@@ -15,19 +15,25 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -35,16 +41,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionEntryHeap {
public VersionedThinRegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -75,9 +96,11 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -86,10 +109,11 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -109,7 +133,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -120,18 +144,21 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -148,6 +175,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -165,6 +193,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -194,6 +223,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -226,8 +256,11 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -246,7 +279,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -276,6 +309,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -318,5 +352,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java
index fcc2a68..49abbfd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java
@@ -15,41 +15,66 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntryHeap {
- public VersionedThinRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VersionedThinRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +82,11 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +106,7 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,18 +117,21 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -119,6 +148,7 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -136,6 +166,7 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -165,6 +196,7 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -197,13 +229,16 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -216,5 +251,8 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java
index 22baf55..8fcf400 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java
@@ -15,44 +15,70 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,6 +87,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -91,13 +118,19 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -113,7 +146,9 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -137,7 +172,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -148,18 +183,21 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -176,6 +214,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -193,6 +232,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -222,6 +262,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -254,12 +295,17 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -270,5 +316,8 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java
index 931faef..1dfe8ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java
@@ -15,44 +15,70 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,6 +87,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -91,13 +118,19 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -113,7 +146,9 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -137,7 +172,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -148,18 +183,21 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -176,6 +214,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -193,6 +232,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -222,6 +262,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -254,12 +295,15 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -270,5 +314,8 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java
index 1f0554e..b35778d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java
@@ -15,44 +15,70 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,6 +87,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -92,13 +119,19 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -114,7 +147,9 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -138,7 +173,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -149,18 +184,21 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -177,6 +215,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -194,6 +233,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -223,6 +263,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -255,13 +296,19 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java
index 0a2ee2a..be895b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java
@@ -15,40 +15,62 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -67,9 +89,11 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -78,6 +102,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -109,13 +134,19 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -131,7 +162,9 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -155,7 +188,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -166,18 +199,21 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -194,6 +230,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -211,6 +248,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -240,6 +278,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -272,8 +311,11 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -287,7 +329,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -306,6 +348,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -335,5 +378,8 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java
index c834c4a..ab314ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java
@@ -15,40 +15,62 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -79,9 +101,11 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -90,6 +114,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -121,13 +146,19 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -143,7 +174,9 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -167,7 +200,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -178,18 +211,21 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -206,6 +242,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -223,6 +260,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -252,6 +290,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -284,8 +323,11 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -304,7 +346,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -334,6 +376,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -376,5 +419,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java
index 9401e7e..c4a5c06 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java
@@ -15,46 +15,71 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionEntryOffHeap {
public VersionedThinRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -63,6 +88,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
private static final AtomicLongFieldUpdater<VersionedThinRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinRegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -93,13 +119,19 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -115,7 +147,9 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -139,7 +173,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -150,18 +184,21 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -178,6 +215,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -195,6 +233,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -224,6 +263,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -256,13 +296,16 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -275,5 +318,8 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 5d5a3fa..8a16ea1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -755,7 +755,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
*
* @return True if the member's heap memory is in a critical state, false otherwise.
*/
- public final boolean isMemberHeapCritical(final InternalDistributedMember member) {
+ public boolean isMemberHeapCritical(final InternalDistributedMember member) {
if (member.equals(this.cache.getMyId())) {
return this.mostRecentEvent.getState().isCritical();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
index ceaeb4b..c701b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
@@ -168,7 +168,7 @@ public class MemoryThresholds {
- (0.01 * THRESHOLD_THICKNESS_EVICT * this.maxMemoryBytes));
}
- public static final boolean isLowMemoryExceptionDisabled() {
+ public static boolean isLowMemoryExceptionDisabled() {
return DISABLE_LOW_MEM_EXCEPTION;
}
[39/69] [abbrv] geode git commit: GEODE-2836: Fix compilation error
introduced by rebase
Posted by ud...@apache.org.
GEODE-2836: Fix compilation error introduced by rebase
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a263adee
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a263adee
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a263adee
Branch: refs/heads/feature/GEODE-2580
Commit: a263adee86627f4ba5cf16e2e34e5623ba98c9f4
Parents: a2ddc61
Author: Jared Stewart <js...@pivotal.io>
Authored: Tue May 16 16:39:02 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Tue May 16 16:39:02 2017 -0700
----------------------------------------------------------------------
.../test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a263adee/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index 38d345f..b139bcd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -4171,7 +4171,7 @@ public abstract class CacheXml66DUnitTest extends CacheXmlTestCase {
* Tests parsing an XML file that specifies a cache listener that is not {@link Declarable}.
*/
@Test
- public void testCallbackNotExplicitlyDeclarableIsStillOK() {
+ public void testCallbackNotExplicitlyDeclarableIsStillOK() throws Exception {
setXmlFile(findFile("callbackNotDeclarable.xml"));
getCache();
[28/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
index a7d06be..b7ab7e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXFarSideCMTracker.java
@@ -83,7 +83,7 @@ public class TXFarSideCMTracker {
this.lastHistoryItem = 0;
}
- public final int getHistorySize() {
+ public int getHistorySize() {
return this.txHistory.length;
}
@@ -91,7 +91,7 @@ public class TXFarSideCMTracker {
* Answers fellow "Far Siders" question about an DACK transaction when the transaction originator
* died before it sent the CommitProcess message.
*/
- public final boolean commitProcessReceived(Object key, DM dm) {
+ public boolean commitProcessReceived(Object key, DM dm) {
// Assume that after the member has departed that we have all its pending
// transaction messages
if (key instanceof TXLockId) {
@@ -137,7 +137,7 @@ public class TXFarSideCMTracker {
* Answers new Grantor query regarding whether it can start handing out new locks. Waits until
* txInProgress is empty.
*/
- public final void waitForAllToProcess() throws InterruptedException {
+ public void waitForAllToProcess() throws InterruptedException {
if (Thread.interrupted())
throw new InterruptedException(); // wisest to do this before the synchronize below
// Assume that a thread interrupt is only sent in the
@@ -155,7 +155,7 @@ public class TXFarSideCMTracker {
* departed/ing Originator (this will most likely be called nearly the same time as
* commitProcessReceived
*/
- public final void waitToProcess(TXLockId lk, DM dm) {
+ public void waitToProcess(TXLockId lk, DM dm) {
waitForMemberToDepart(lk.getMemberId(), dm);
final TXCommitMessage mess;
synchronized (this.txInProgress) {
@@ -189,7 +189,7 @@ public class TXFarSideCMTracker {
/**
* Register a <code>MemberhipListener</code>, wait until the member is gone.
*/
- private final void waitForMemberToDepart(final InternalDistributedMember memberId, DM dm) {
+ private void waitForMemberToDepart(final InternalDistributedMember memberId, DM dm) {
if (!dm.getDistributionManagerIds().contains(memberId)) {
return;
}
@@ -239,7 +239,7 @@ public class TXFarSideCMTracker {
* Indicate that the transaction message has been processed and to place it in the transaction
* history
*/
- public final TXCommitMessage processed(TXCommitMessage processedMess) {
+ public TXCommitMessage processed(TXCommitMessage processedMess) {
final TXCommitMessage mess;
final Object key = processedMess.getTrackerKey();
synchronized (this.txInProgress) {
@@ -269,7 +269,7 @@ public class TXFarSideCMTracker {
* Indicate that this message is never going to be processed, typically used in the case where
* none of the FarSiders received the CommitProcessMessage
**/
- public final void removeMessage(TXCommitMessage deadMess) {
+ public void removeMessage(TXCommitMessage deadMess) {
synchronized (this.txInProgress) {
this.txInProgress.remove(deadMess.getTrackerKey());
// For any waitForAllToComplete
@@ -282,7 +282,7 @@ public class TXFarSideCMTracker {
/**
* Retrieve the commit message associated with the lock
*/
- public final TXCommitMessage get(Object key) {
+ public TXCommitMessage get(Object key) {
final TXCommitMessage mess;
synchronized (this.txInProgress) {
mess = (TXCommitMessage) this.txInProgress.get(key);
@@ -290,7 +290,7 @@ public class TXFarSideCMTracker {
return mess;
}
- public final TXCommitMessage waitForMessage(Object key, DM dm) {
+ public TXCommitMessage waitForMessage(Object key, DM dm) {
TXCommitMessage msg = null;
synchronized (this.txInProgress) {
msg = (TXCommitMessage) this.txInProgress.get(key);
@@ -310,7 +310,7 @@ public class TXFarSideCMTracker {
/**
* The transcation commit message has been received
*/
- public final void add(TXCommitMessage msg) {
+ public void add(TXCommitMessage msg) {
synchronized (this.txInProgress) {
final Object key = msg.getTrackerKey();
if (key == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
index db74765..32fe284 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXId.java
@@ -34,7 +34,7 @@ import org.apache.geode.distributed.internal.membership.*;
* @see TXManagerImpl#begin
* @see org.apache.geode.cache.CacheTransactionManager#getTransactionId
*/
-public final class TXId extends ExternalizableDSFID implements TransactionId {
+public class TXId extends ExternalizableDSFID implements TransactionId {
/** The domain of a transaction, currently the VM's unique identifier */
private InternalDistributedMember memberId;
/** Per unique identifier within the transactions memberId */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
index 6a1eeed..c229997 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXRemoteCommitMessage.java
@@ -127,7 +127,7 @@ public class TXRemoteCommitMessage extends TXMessage {
*
* @since GemFire 6.5
*/
- public static final class TXRemoteCommitReplyMessage extends ReplyMessage {
+ public static class TXRemoteCommitReplyMessage extends ReplyMessage {
private transient TXCommitMessage commitMessage;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
index e1a2ece..261f90c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXReservationMgr.java
@@ -107,7 +107,7 @@ public class TXReservationMgr {
}
}
- private final Object getRegionObject(TXRegionLockRequestImpl lr) {
+ private Object getRegionObject(TXRegionLockRequestImpl lr) {
if (local) {
return lr.getLocalRegion();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 0a9d80e..6a6e9ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -1220,7 +1220,7 @@ public class TXState implements TXStateInterface {
* @param ifNew only write the entry if it currently does not exist
* @param expectedOldValue the required old value or null
*/
- final TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, boolean ifNew,
+ TXEntryState txWriteEntry(LocalRegion region, EntryEventImpl event, boolean ifNew,
boolean requireOldValue, Object expectedOldValue) throws EntryNotFoundException {
boolean createIfAbsent = true;
if (event.getOperation() == Operation.REPLACE) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
index 22b95f3..6b6b712 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxyImpl.java
@@ -86,15 +86,15 @@ public class TXStateProxyImpl implements TXStateProxy {
return this.lock;
}
- final boolean isJTA() {
+ boolean isJTA() {
return isJTA;
}
- final public TXId getTxId() {
+ public TXId getTxId() {
return txId;
}
- public final TXManagerImpl getTxMgr() {
+ public TXManagerImpl getTxMgr() {
return txMgr;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
index 54f57da..f2809a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Token.java
@@ -88,23 +88,23 @@ public abstract class Token {
/**
* Returns true if o is INVALID, LOCAL_INVALID, DESTROYED, or REMOVED.
*/
- public static final boolean isInvalidOrRemoved(Object o) {
+ public static boolean isInvalidOrRemoved(Object o) {
return isInvalid(o) || isRemoved(o);
}
- public static final boolean isInvalid(Object o) {
+ public static boolean isInvalid(Object o) {
return o == INVALID || o == LOCAL_INVALID;
}
- public static final boolean isRemoved(Object o) {
+ public static boolean isRemoved(Object o) {
return o == DESTROYED || o == REMOVED_PHASE1 || o == REMOVED_PHASE2 || o == TOMBSTONE;
}
- public static final boolean isRemovedFromDisk(Object o) {
+ public static boolean isRemovedFromDisk(Object o) {
return o == DESTROYED || o == REMOVED_PHASE1 || o == REMOVED_PHASE2;
}
- public static final boolean isDestroyed(Object o) {
+ public static boolean isDestroyed(Object o) {
return o == DESTROYED;
}
@@ -303,7 +303,7 @@ public abstract class Token {
}
/** Token used in StreamingOperation, StreamingPartitionOperation */
- public static final class EndOfStream extends Token implements DataSerializableFixedID {
+ public static class EndOfStream extends Token implements DataSerializableFixedID {
public EndOfStream() {}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/UnsharedImageState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UnsharedImageState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UnsharedImageState.java
index 78a4c99..8b4c380 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UnsharedImageState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UnsharedImageState.java
@@ -256,7 +256,7 @@ public class UnsharedImageState implements ImageState {
}
/** tracks RVV versions applied to the region during GII */
- private static final class VersionTagEntryImpl implements ImageState.VersionTagEntry {
+ private static class VersionTagEntryImpl implements ImageState.VersionTagEntry {
Object key;
VersionSource member;
long regionVersion;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
index 53c3832..5718001 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateAttributesProcessor.java
@@ -258,7 +258,7 @@ public class UpdateAttributesProcessor {
}
- public static final class UpdateAttributesMessage extends HighPriorityDistributionMessage
+ public static class UpdateAttributesMessage extends HighPriorityDistributionMessage
implements MessageWithReply {
protected String adviseePath;
@@ -376,7 +376,7 @@ public class UpdateAttributesProcessor {
}
- public final static class ProfileReplyMessage extends ReplyMessage {
+ public static class ProfileReplyMessage extends ReplyMessage {
Profile profile;
public static void send(InternalDistributedMember recipient, int processorId,
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
index 1afae86..2ba9517 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateOperation.java
@@ -496,13 +496,13 @@ public class UpdateOperation extends AbstractUpdateOperation {
}
}
- public static final class UpdateWithContextMessage extends UpdateMessage {
+ public static class UpdateWithContextMessage extends UpdateMessage {
protected transient ClientProxyMembershipID clientID;
@Override
@Retained
- final public EntryEventImpl createEntryEvent(DistributedRegion rgn) {
+ public EntryEventImpl createEntryEvent(DistributedRegion rgn) {
// Object oldValue = null;
final Object argNewValue = null;
// boolean localLoad = false, netLoad = false, netSearch = false,
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
index a2894e3..c559b5d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
@@ -34,7 +34,7 @@ import org.apache.geode.pdx.PdxInstance;
* then on keep a reference to the deserialized form. So it "prefers deserialization".
*
*/
-public final class VMCachedDeserializable implements CachedDeserializable, DataSerializableFixedID {
+public class VMCachedDeserializable implements CachedDeserializable, DataSerializableFixedID {
/** The cached value */
private volatile Object value;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
index 93dfa82..3a32efd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMLRURegionMap.java
@@ -26,7 +26,7 @@ import org.apache.geode.internal.cache.lru.*;
*
*
*/
-final class VMLRURegionMap extends AbstractLRURegionMap {
+class VMLRURegionMap extends AbstractLRURegionMap {
VMLRURegionMap(Object owner, Attributes attr, InternalRegionArguments internalRegionArgs) {
super(internalRegionArgs);
@@ -42,22 +42,22 @@ final class VMLRURegionMap extends AbstractLRURegionMap {
private NewLRUClockHand lruList;
@Override
- protected final void _setCCHelper(EnableLRU ccHelper) {
+ protected void _setCCHelper(EnableLRU ccHelper) {
this.ccHelper = ccHelper;
}
@Override
- protected final EnableLRU _getCCHelper() {
+ protected EnableLRU _getCCHelper() {
return this.ccHelper;
}
@Override
- protected final void _setLruList(NewLRUClockHand lruList) {
+ protected void _setLruList(NewLRUClockHand lruList) {
this.lruList = lruList;
}
@Override
- public final NewLRUClockHand _getLruList() {
+ public NewLRUClockHand _getLruList() {
return this.lruList;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMRegionMap.java
index c1cfb14..989a112 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMRegionMap.java
@@ -22,7 +22,7 @@ package org.apache.geode.internal.cache;
*
*
*/
-final class VMRegionMap extends AbstractRegionMap {
+class VMRegionMap extends AbstractRegionMap {
VMRegionMap(Object owner, Attributes attr, InternalRegionArguments internalRegionArgs) {
super(internalRegionArgs);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 e2043f2..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
@@ -15,41 +15,71 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEntryHeap {
- public VMStatsDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -57,10 +87,11 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +111,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,19 +122,22 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -120,7 +154,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -128,7 +162,9 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -153,7 +189,6 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -193,108 +228,113 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -304,7 +344,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -314,13 +354,14 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
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");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -329,12 +370,12 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -347,14 +388,15 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -366,12 +408,18 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -382,5 +430,8 @@ 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/a4458531/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 d65ea70..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
@@ -15,41 +15,71 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEntryHeap {
- public VMStatsDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -57,10 +87,11 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +111,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,19 +122,22 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -120,7 +154,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -128,7 +162,9 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -153,7 +189,6 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -193,108 +228,113 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -304,7 +344,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -314,13 +354,14 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
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");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -329,12 +370,12 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -347,14 +388,15 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -366,12 +408,16 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -382,5 +428,8 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
index cbfa0f8..0c6c3de 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
@@ -15,42 +15,70 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegionEntryHeap {
public VMStatsDiskLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -59,10 +87,11 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -82,7 +111,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -93,19 +122,22 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -122,7 +154,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -130,7 +162,9 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -155,7 +189,6 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -195,108 +228,113 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -306,7 +344,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -316,6 +354,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapObjectKey.class,
"hitCount");
@@ -324,7 +363,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -333,12 +372,12 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -351,14 +390,15 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -370,13 +410,20 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
index 1428eb1..fe5fad6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
@@ -15,19 +15,28 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -35,18 +44,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegionEntryHeap {
public VMStatsDiskLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -65,9 +90,11 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -76,10 +103,11 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -99,7 +127,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -110,19 +138,22 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -139,7 +170,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -147,7 +178,9 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -172,7 +205,6 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -212,108 +244,113 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -323,7 +360,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -333,6 +370,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapStringKey1.class,
"hitCount");
@@ -341,7 +379,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -350,12 +388,12 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -368,14 +406,15 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -387,8 +426,12 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -402,7 +445,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -421,6 +464,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -450,5 +494,8 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
index 7a11c77..929e14e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
@@ -15,19 +15,28 @@
package org.apache.geode.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 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;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -36,17 +45,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegionEntryHeap {
public VMStatsDiskLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -77,9 +102,11 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -88,10 +115,11 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -111,7 +139,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -122,19 +150,22 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -151,7 +182,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -159,7 +190,9 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -184,7 +217,6 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -224,108 +256,113 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -335,7 +372,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -345,6 +382,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryHeapStringKey2.class,
"hitCount");
@@ -353,7 +391,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -362,12 +400,12 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -380,14 +418,15 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -399,8 +438,12 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -419,7 +462,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -449,6 +492,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -491,5 +535,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[19/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapIntKey.java
index 2f14906..a479c66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapIntKey.java
@@ -15,43 +15,70 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,6 +86,7 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -89,13 +117,19 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -111,7 +145,9 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -135,7 +171,7 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -146,119 +182,126 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -269,5 +312,8 @@ public class VMThinLRURegionEntryOffHeapIntKey extends VMThinLRURegionEntryOffHe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapLongKey.java
index da80f16..d0347dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapLongKey.java
@@ -15,43 +15,70 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,6 +86,7 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -89,13 +117,19 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -111,7 +145,9 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -135,7 +171,7 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -146,119 +182,124 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -269,5 +310,8 @@ public class VMThinLRURegionEntryOffHeapLongKey extends VMThinLRURegionEntryOffH
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapObjectKey.java
index c44fd79..3b8c12c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapObjectKey.java
@@ -15,43 +15,70 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,6 +86,7 @@ public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOf
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapObjectKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -89,13 +117,19 @@ public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOf
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -111,7 +145,9 @@ public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOf
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -135,7 +171,7 @@ public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOf
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -146,120 +182,128 @@ public class VMThinLRURegionEntryOffHeapObjectKey extends VMThinLRURegionEntryOf
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey1.java
index 4f5ab15..9005640 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey1.java
@@ -15,39 +15,62 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -66,9 +89,11 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -77,6 +102,7 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -107,13 +133,19 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -129,7 +161,9 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -153,7 +187,7 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -164,115 +198,120 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -286,7 +325,7 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -305,6 +344,7 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -334,5 +374,8 @@ public class VMThinLRURegionEntryOffHeapStringKey1 extends VMThinLRURegionEntryO
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey2.java
index 2687672..4529ca8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapStringKey2.java
@@ -15,39 +15,62 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -78,9 +101,11 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -89,6 +114,7 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -119,13 +145,19 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -141,7 +173,9 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -165,7 +199,7 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -176,115 +210,120 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -303,7 +342,7 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -333,6 +372,7 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -375,5 +415,7 @@ public class VMThinLRURegionEntryOffHeapStringKey2 extends VMThinLRURegionEntryO
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapUUIDKey.java
index 2ec42e6..723dade 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryOffHeapUUIDKey.java
@@ -15,45 +15,71 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffHeap {
public VMThinLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -61,6 +87,7 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -91,13 +118,19 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -113,7 +146,9 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -137,7 +172,7 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -148,120 +183,125 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -274,5 +314,8 @@ public class VMThinLRURegionEntryOffHeapUUIDKey extends VMThinLRURegionEntryOffH
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapIntKey.java
index d633bc7..1222ba7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapIntKey.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -26,23 +30,43 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapIntKey extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VMThinRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -50,10 +74,11 @@ public class VMThinRegionEntryHeapIntKey extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -73,7 +98,7 @@ public class VMThinRegionEntryHeapIntKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -84,23 +109,29 @@ public class VMThinRegionEntryHeapIntKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -111,5 +142,8 @@ public class VMThinRegionEntryHeapIntKey extends VMThinRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapLongKey.java
index 1032dbb..36e69b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapLongKey.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,22 +31,42 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapLongKey extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VMThinRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -50,10 +74,11 @@ public class VMThinRegionEntryHeapLongKey extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -73,7 +98,7 @@ public class VMThinRegionEntryHeapLongKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -84,23 +109,27 @@ public class VMThinRegionEntryHeapLongKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -111,5 +140,8 @@ public class VMThinRegionEntryHeapLongKey extends VMThinRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapObjectKey.java
index 616b368..34a8da7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapObjectKey.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -25,24 +29,44 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapObjectKey extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, value);
+ public VMThinRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -50,10 +74,11 @@ public class VMThinRegionEntryHeapObjectKey extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -73,7 +98,7 @@ public class VMThinRegionEntryHeapObjectKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -84,24 +109,31 @@ public class VMThinRegionEntryHeapObjectKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey1.java
index e2657d2..0023f93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey1.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -29,17 +33,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMThinRegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -58,9 +77,11 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -68,10 +89,11 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -91,7 +113,7 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -102,19 +124,23 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -128,7 +154,7 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -147,6 +173,7 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -176,5 +203,8 @@ public class VMThinRegionEntryHeapStringKey1 extends VMThinRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey2.java
index 4183ffb..a4e4c2c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapStringKey2.java
@@ -15,7 +15,11 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -30,16 +34,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMThinRegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -70,9 +89,11 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -80,10 +101,11 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -103,7 +125,7 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -114,19 +136,23 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -145,7 +171,7 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -175,6 +201,7 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -217,5 +244,7 @@ public class VMThinRegionEntryHeapStringKey2 extends VMThinRegionEntryHeap {
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapUUIDKey.java
index 5fe22a7..d400e96 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryHeapUUIDKey.java
@@ -15,8 +15,13 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -29,22 +34,40 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryHeapUUIDKey extends VMThinRegionEntryHeap {
- public VMThinRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VMThinRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -52,10 +75,11 @@ public class VMThinRegionEntryHeapUUIDKey extends VMThinRegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -75,7 +99,7 @@ public class VMThinRegionEntryHeapUUIDKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -86,24 +110,28 @@ public class VMThinRegionEntryHeapUUIDKey extends VMThinRegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -116,5 +144,8 @@ public class VMThinRegionEntryHeapUUIDKey extends VMThinRegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapIntKey.java
index 3987eb6..2d17643 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapIntKey.java
@@ -15,11 +15,16 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,27 +32,46 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,6 +79,7 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -85,13 +110,19 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -107,7 +138,9 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -131,7 +164,7 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -142,23 +175,29 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -169,5 +208,8 @@ public class VMThinRegionEntryOffHeapIntKey extends VMThinRegionEntryOffHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapLongKey.java
index 7b519c5..9763544 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinRegionEntryOffHeapLongKey.java
@@ -15,11 +15,16 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
@@ -27,27 +32,46 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
public VMThinRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -55,6 +79,7 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinRegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -85,13 +110,19 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -107,7 +138,9 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -131,7 +164,7 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -142,23 +175,27 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -169,5 +206,8 @@ public class VMThinRegionEntryOffHeapLongKey extends VMThinRegionEntryOffHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[22/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
index 4776dad..3a9abff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java
@@ -15,37 +15,59 @@
package org.apache.geode.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 org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -76,9 +98,11 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -86,6 +110,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey2.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -116,13 +141,19 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -138,7 +169,9 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -162,7 +195,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -173,21 +206,24 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -197,7 +233,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -207,13 +243,14 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey2.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapStringKey2> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapStringKey2.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -222,12 +259,12 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -240,14 +277,15 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -259,8 +297,12 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -279,7 +321,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -309,6 +351,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -351,5 +394,7 @@ public class VMStatsRegionEntryOffHeapStringKey2 extends VMStatsRegionEntryOffHe
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
index a69b31c..6f0eecc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java
@@ -15,43 +15,68 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.internal.InternalStatisticsDisabledException;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap {
public VMStatsRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -59,6 +84,7 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -89,13 +115,19 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -111,7 +143,9 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -135,7 +169,7 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -146,21 +180,24 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -170,7 +207,7 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -180,13 +217,14 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsRegionEntryOffHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsRegionEntryOffHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -195,12 +233,12 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -213,14 +251,15 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -232,13 +271,17 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -251,5 +294,8 @@ public class VMStatsRegionEntryOffHeapUUIDKey extends VMStatsRegionEntryOffHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
index a8023eb..c598c3b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
@@ -15,40 +15,69 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntryHeap {
- public VMThinDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -56,10 +85,11 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -79,7 +109,7 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -90,19 +120,22 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -119,7 +152,7 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -127,7 +160,9 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -152,7 +187,6 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -192,110 +226,118 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -306,5 +348,8 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
index 30eeece..0d2c00b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
@@ -15,40 +15,69 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntryHeap {
- public VMThinDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -56,10 +85,11 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -79,7 +109,7 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -90,19 +120,22 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -119,7 +152,7 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -127,7 +160,9 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -152,7 +187,6 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -192,110 +226,116 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -306,5 +346,8 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
index 2723b1f..82fe30c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
@@ -15,41 +15,68 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEntryHeap {
public VMThinDiskLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
- Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -58,10 +85,11 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapObjectKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -81,7 +109,7 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -92,19 +120,22 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -121,7 +152,7 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -129,7 +160,9 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -154,7 +187,6 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -194,111 +226,120 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
index 515ea72..036b3d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
@@ -15,17 +15,25 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -34,18 +42,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionEntryHeap {
public VMThinDiskLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -64,9 +88,11 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -75,10 +101,11 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -98,7 +125,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -109,19 +136,22 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -138,7 +168,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -146,7 +176,9 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -171,7 +203,6 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -211,106 +242,112 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -324,7 +361,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -343,6 +380,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -372,5 +410,8 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
index 9d0d247..aa212c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
@@ -15,17 +15,25 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -35,17 +43,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionEntryHeap {
public VMThinDiskLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -76,9 +100,11 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -87,10 +113,11 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -110,7 +137,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -121,19 +148,22 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -150,7 +180,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -158,7 +188,9 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -183,7 +215,6 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -223,106 +254,112 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -341,7 +378,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -371,6 +408,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -413,5 +451,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
index 6480016..8f069e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
@@ -15,18 +15,27 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -34,23 +43,44 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntryHeap {
- public VMThinDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMThinDiskLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -58,10 +88,11 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -81,7 +112,7 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -92,19 +123,22 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -121,7 +155,7 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -129,7 +163,9 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -154,7 +190,6 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -194,111 +229,117 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -311,5 +352,8 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
index 642d4f7..64958dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
@@ -15,45 +15,74 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
+// disk: 1
+// lru: 1
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEntryOffHeap {
public VMThinDiskLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -62,6 +91,7 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
private static final AtomicLongFieldUpdater<VMThinDiskLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -92,13 +122,19 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -114,7 +150,9 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -138,7 +176,7 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -149,19 +187,22 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -178,7 +219,7 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -186,7 +227,9 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -211,7 +254,6 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -251,110 +293,118 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -365,5 +415,8 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[20/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
index 38b6bc2..9fc2d7e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
@@ -15,42 +15,69 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -58,6 +85,7 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -88,13 +116,19 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -110,7 +144,9 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -134,7 +170,7 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -145,19 +181,22 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -167,7 +206,9 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -192,7 +233,6 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -232,12 +272,19 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -248,5 +295,8 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
index 303c91b..beec34c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
@@ -15,42 +15,69 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -58,6 +85,7 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -88,13 +116,19 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -110,7 +144,9 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -134,7 +170,7 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -145,19 +181,22 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -167,7 +206,9 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -192,7 +233,6 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -232,12 +272,17 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -248,5 +293,8 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
index d604f75..e1a7ef0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
@@ -15,42 +15,68 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -59,6 +85,7 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -89,13 +116,19 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -111,7 +144,9 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -135,7 +170,7 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -146,19 +181,22 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -168,7 +206,9 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -193,7 +233,6 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -233,13 +272,21 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
index ac94dc6..b5d4334 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
@@ -15,38 +15,61 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -65,9 +88,11 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -76,6 +101,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -106,13 +132,19 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -128,7 +160,9 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -152,7 +186,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -163,19 +197,22 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -185,7 +222,9 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -210,7 +249,6 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -250,8 +288,13 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -265,7 +308,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -284,6 +327,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -313,5 +357,8 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
index 584f382..4a3b762 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
@@ -15,38 +15,61 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -77,9 +100,11 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -88,6 +113,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -118,13 +144,19 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -140,7 +172,9 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -164,7 +198,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -175,19 +209,22 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -197,7 +234,9 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -222,7 +261,6 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -262,8 +300,13 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -282,7 +325,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -312,6 +355,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -354,5 +398,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
index a619574..6fa3329 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
@@ -15,44 +15,72 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
// stats: STATS
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOffHeap {
public VMThinDiskRegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -60,6 +88,7 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinDiskRegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinDiskRegionEntryOffHeapUUIDKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -90,13 +119,19 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -112,7 +147,9 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -136,7 +173,7 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -147,19 +184,22 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -169,7 +209,9 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -194,7 +236,6 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -234,13 +275,18 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -253,5 +299,8 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapIntKey.java
index 5472679..30e4834 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapIntKey.java
@@ -15,38 +15,65 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapIntKey extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, value);
+ public VMThinLRURegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -54,10 +81,11 @@ public class VMThinLRURegionEntryHeapIntKey extends VMThinLRURegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -77,7 +105,7 @@ public class VMThinLRURegionEntryHeapIntKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -88,119 +116,126 @@ public class VMThinLRURegionEntryHeapIntKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -211,5 +246,8 @@ public class VMThinLRURegionEntryHeapIntKey extends VMThinLRURegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapLongKey.java
index e025232..263ff19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapLongKey.java
@@ -15,38 +15,65 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapLongKey extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, value);
+ public VMThinLRURegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -54,10 +81,11 @@ public class VMThinLRURegionEntryHeapLongKey extends VMThinLRURegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -77,7 +105,7 @@ public class VMThinLRURegionEntryHeapLongKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -88,119 +116,124 @@ public class VMThinLRURegionEntryHeapLongKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -211,5 +244,8 @@ public class VMThinLRURegionEntryHeapLongKey extends VMThinLRURegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapObjectKey.java
index edfb327..b0d780b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapObjectKey.java
@@ -15,38 +15,65 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapObjectKey extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, value);
+ public VMThinLRURegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -54,10 +81,11 @@ public class VMThinLRURegionEntryHeapObjectKey extends VMThinLRURegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -77,7 +105,7 @@ public class VMThinLRURegionEntryHeapObjectKey extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -88,120 +116,128 @@ public class VMThinLRURegionEntryHeapObjectKey extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey1.java
index 1ee29b3..0e41d9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey1.java
@@ -15,16 +15,23 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -33,17 +40,32 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMThinLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -62,9 +84,11 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -72,10 +96,11 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -95,7 +120,7 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -106,115 +131,120 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -228,7 +258,7 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -247,6 +277,7 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -276,5 +307,8 @@ public class VMThinLRURegionEntryHeapStringKey1 extends VMThinLRURegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey2.java
index 8d3afdb..4a9f111 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapStringKey2.java
@@ -15,16 +15,23 @@
package org.apache.geode.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 org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -34,16 +41,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, value);
+ public VMThinLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -74,9 +96,11 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -84,10 +108,11 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -107,7 +132,7 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -118,115 +143,120 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -245,7 +275,7 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -275,6 +305,7 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -317,5 +348,7 @@ public class VMThinLRURegionEntryHeapStringKey2 extends VMThinLRURegionEntryHeap
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapUUIDKey.java
index ac2ee13..75d7638 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMThinLRURegionEntryHeapUUIDKey.java
@@ -15,17 +15,25 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
// versioned: VERSIONED
// offheap: OFFHEAP
@@ -33,22 +41,40 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMThinLRURegionEntryHeapUUIDKey extends VMThinLRURegionEntryHeap {
- public VMThinLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, value);
+ public VMThinLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -56,10 +82,11 @@ public class VMThinLRURegionEntryHeapUUIDKey extends VMThinLRURegionEntryHeap {
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMThinLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMThinLRURegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -79,7 +106,7 @@ public class VMThinLRURegionEntryHeapUUIDKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -90,120 +117,125 @@ public class VMThinLRURegionEntryHeapUUIDKey extends VMThinLRURegionEntryHeap {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -216,5 +248,8 @@ public class VMThinLRURegionEntryHeapUUIDKey extends VMThinLRURegionEntryHeap {
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[45/69] [abbrv] geode git commit: GEODE-2927: fix pulse logging and
useLocator, SSL flags
Posted by ud...@apache.org.
GEODE-2927: fix pulse logging and useLocator, SSL flags
* using local mbs server connection will bypass all the mbean security checks
* do not update the mbean attribute since pulse user has no cluster:write privilege at all
* Created EmbeddedPulseRule for tests
* simplify PulseAppListener
* use log4j2 logging configurations
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0f978a6d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0f978a6d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0f978a6d
Branch: refs/heads/feature/GEODE-2580
Commit: 0f978a6df711d04e0c7c1926fb1e297d07c21aa3
Parents: b3fc0c8
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Mar 22 19:45:19 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu May 18 07:46:54 2017 -0700
----------------------------------------------------------------------
.../test/dunit/rules/EmbeddedPulseRule.java | 39 +-
.../geode/tools/pulse/PulseSecurityTest.java | 34 +-
.../tools/pulse/PulseSecurityWithSSLTest.java | 1 -
.../tools/pulse/PulseVerificationTest.java | 70 +++
.../management/internal/ManagementAgent.java | 8 +-
.../cli/commands/LauncherLifecycleCommands.java | 1 -
.../tools/pulse/internal/PulseAppListener.java | 583 ++-----------------
.../internal/controllers/PulseController.java | 8 -
.../tools/pulse/internal/data/Cluster.java | 43 +-
.../pulse/internal/data/IClusterUpdater.java | 6 +
.../pulse/internal/data/JMXDataUpdater.java | 157 +----
.../tools/pulse/internal/data/Repository.java | 127 +---
.../security/GemFireAuthenticationProvider.java | 33 +-
.../pulse/internal/security/LogoutHandler.java | 22 +-
.../internal/service/ClusterMemberService.java | 2 -
.../service/ClusterMembersRGraphService.java | 20 +-
geode-pulse/src/main/resources/log4j2.xml | 31 +
geode-pulse/src/main/resources/pulse.properties | 23 +-
.../controllers/PulseControllerJUnitTest.java | 6 -
19 files changed, 325 insertions(+), 889 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/EmbeddedPulseRule.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/EmbeddedPulseRule.java b/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/EmbeddedPulseRule.java
index 0ed5403..f81d7f4 100644
--- a/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/EmbeddedPulseRule.java
+++ b/geode-assembly/src/test/java/org/apache/geode/test/dunit/rules/EmbeddedPulseRule.java
@@ -18,37 +18,58 @@ package org.apache.geode.test.dunit.rules;
import org.apache.geode.tools.pulse.internal.data.Repository;
import org.junit.rules.ExternalResource;
-import java.util.function.Supplier;
-
/**
* This is used to test embedded pulse. If your test needs to check pulse's repository object for
* assertions, use this rules to properly initialize and cleanup the repository
*
+ *
+ *
*/
public class EmbeddedPulseRule extends ExternalResource {
- private Supplier<Integer> portSupplier;
private Repository repository;
- public EmbeddedPulseRule(Supplier<Integer> portSupplier) {
- this.portSupplier = portSupplier;
- }
-
public Repository getRepository() {
return repository;
}
protected void before() throws Throwable {
repository = Repository.get();
- repository.setJmxHost("localhost");
- repository.setJmxPort(portSupplier.get() + "");
+ cleanup();
+ repository.setHost("localhost");
+ }
+
+ public void useJmxPort(int jmxPort) {
repository.setJmxUseLocator(false);
+ repository.setPort(jmxPort + "");
+ }
+
+ public void useLocatorPort(int locatorPort) {
+ repository.setJmxUseLocator(true);
+ repository.setPort(locatorPort + "");
+ }
+
+ public void setLocatorSSL(boolean locatorSSL) {
+ repository.setUseSSLLocator(locatorSSL);
+ }
+
+ public void setJmxSSL(boolean jmxSSL) {
+ repository.setUseSSLManager(jmxSSL);
}
/**
* Override to tear down your specific external resource.
*/
protected void after() {
+ cleanup();
+ }
+
+ private void cleanup() {
if (repository != null) {
+ repository.setPort("-1");
+ repository.setHost("");
+ repository.setJmxUseLocator(false);
+ repository.setUseSSLManager(false);
+ repository.setUseSSLManager(false);
repository.removeAllClusters();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
index 7278c84..832564f 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
@@ -17,28 +17,34 @@ package org.apache.geode.tools.pulse;
import static org.assertj.core.api.Assertions.assertThat;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.dunit.rules.EmbeddedPulseRule;
import org.apache.geode.test.dunit.rules.HttpClientRule;
-import org.apache.geode.test.dunit.rules.LocatorStarterRule;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.http.HttpResponse;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.rules.RuleChain;
@Category(IntegrationTest.class)
public class PulseSecurityTest {
- private LocatorStarterRule locator =
- new LocatorStarterRule().withSecurityManager(SimpleTestSecurityManager.class).withAutoStart();
-
- private HttpClientRule client = new HttpClientRule(locator::getHttpPort);
+ @ClassRule
+ public static ServerStarterRule server =
+ new ServerStarterRule().withSecurityManager(SimpleTestSecurityManager.class).withJMXManager()
+ .withRegion(RegionShortcut.REPLICATE, "regionA");
@Rule
- public RuleChain ruleChain = RuleChain.outerRule(locator).around(client);
+ public EmbeddedPulseRule pulse = new EmbeddedPulseRule();
+ @Rule
+ public HttpClientRule client = new HttpClientRule(server::getHttpPort);
@Test
@@ -88,4 +94,18 @@ public class PulseSecurityTest {
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(403);
}
+ @Test
+ public void queryUsingEmbededPulseWillHaveAuthorizationEnabled() throws Exception {
+ pulse.useJmxPort(server.getJmxPort());
+ // using "cluster" to connect to jmx manager will not get authorized to execute query
+ Cluster cluster = pulse.getRepository().getCluster("cluster", "cluster");
+ ObjectNode result = cluster.executeQuery("select * from /regionA a order by a", null, 0);
+ assertThat(result.toString()).contains("cluster not authorized for DATA:READ");
+
+ // using "data" to connect to jmx manager will succeeed
+ cluster = pulse.getRepository().getCluster("data", "data");
+ result = cluster.executeQuery("select * from /regionA a order by a", null, 0);
+ assertThat(result.toString()).contains("No Data Found");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
index 3b9cd72..0bacd99 100644
--- a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
@@ -56,7 +56,6 @@ public class PulseSecurityWithSSLTest {
securityProps.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannels.JMX);
securityProps.setProperty(SSL_KEYSTORE, jks.getCanonicalPath());
securityProps.setProperty(SSL_KEYSTORE_PASSWORD, "password");
- // securityProps.setProperty(SSL_KEYSTORE_TYPE, "JKS");
securityProps.setProperty(SSL_TRUSTSTORE, jks.getCanonicalPath());
securityProps.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
securityProps.setProperty(SSL_PROTOCOLS, "TLSv1.2");
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
new file mode 100644
index 0000000..44fadb6
--- /dev/null
+++ b/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseVerificationTest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.tools.pulse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.geode.test.dunit.rules.EmbeddedPulseRule;
+import org.apache.geode.test.dunit.rules.HttpClientRule;
+import org.apache.geode.test.dunit.rules.LocatorStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.http.HttpResponse;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+@Category(IntegrationTest.class)
+public class PulseVerificationTest {
+
+ @ClassRule
+ public static LocatorStarterRule locator =
+ new LocatorStarterRule().withJMXManager().withAutoStart();
+
+ @Rule
+ public EmbeddedPulseRule pulse = new EmbeddedPulseRule();
+
+ @Rule
+ public HttpClientRule client = new HttpClientRule(locator::getHttpPort);
+
+ @Test
+ public void loginWithIncorrectPassword() throws Exception {
+ HttpResponse response = client.loginToPulse("admin", "wrongPassword");
+ assertThat(response.getStatusLine().getStatusCode()).isEqualTo(302);
+ assertThat(response.getFirstHeader("Location").getValue())
+ .contains("/pulse/login.html?error=BAD_CREDS");
+
+ client.loginToPulseAndVerify("admin", "admin");
+ }
+
+ @Test
+ public void testConnectToJmx() throws Exception {
+ pulse.useJmxPort(locator.getJmxPort());
+ Cluster cluster = pulse.getRepository().getCluster("admin", null);
+ assertThat(cluster.isConnectedFlag()).isTrue();
+ assertThat(cluster.getServerCount()).isEqualTo(0);
+ }
+
+ @Test
+ public void testConnectToLocator() throws Exception {
+ pulse.useLocatorPort(locator.getPort());
+ Cluster cluster = pulse.getRepository().getCluster("admin", null);
+ assertThat(cluster.isConnectedFlag()).isTrue();
+ assertThat(cluster.getServerCount()).isEqualTo(0);
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
index 62310e8..bf0b99c 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
@@ -103,6 +103,7 @@ public class ManagementAgent {
private static final String PULSE_EMBEDDED_PROP = "pulse.embedded";
private static final String PULSE_PORT_PROP = "pulse.port";
private static final String PULSE_USESSL_MANAGER = "pulse.useSSL.manager";
+ private static final String PULSE_USESSL_LOCATOR = "pulse.useSSL.locator";
public ManagementAgent(DistributionConfig config) {
this.config = config;
@@ -272,9 +273,12 @@ public class ManagementAgent {
System.setProperty(PULSE_EMBEDDED_PROP, "true");
System.setProperty(PULSE_PORT_PROP, "" + config.getJmxManagerPort());
- final SocketCreator socketCreator =
+ final SocketCreator jmxSocketCreator =
SocketCreatorFactory.getSocketCreatorForComponent(SecurableCommunicationChannel.JMX);
- System.setProperty(PULSE_USESSL_MANAGER, socketCreator.useSSL() + "");
+ final SocketCreator locatorSocketCreator = SocketCreatorFactory
+ .getSocketCreatorForComponent(SecurableCommunicationChannel.LOCATOR);
+ System.setProperty(PULSE_USESSL_MANAGER, jmxSocketCreator.useSSL() + "");
+ System.setProperty(PULSE_USESSL_LOCATOR, locatorSocketCreator.useSSL() + "");
this.httpServer = JettyHelper.startJetty(this.httpServer);
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index 101bae4..0de41c0 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -2281,7 +2281,6 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliCommand(value = CliStrings.START_PULSE, help = CliStrings.START_PULSE__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER,
CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M})
- // TODO change url parameter type to URL when I figure out the Converter logic in Gfsh
public Result startPulse(@CliOption(key = CliStrings.START_PULSE__URL,
unspecifiedDefaultValue = "http://localhost:7070/pulse",
help = CliStrings.START_PULSE__URL__HELP) final String url) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
index 35f494b..34dbf2e 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
@@ -18,25 +18,13 @@
package org.apache.geode.tools.pulse.internal;
import org.apache.geode.tools.pulse.internal.controllers.PulseController;
-import org.apache.geode.tools.pulse.internal.data.PulseConfig;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.tools.pulse.internal.data.Repository;
-import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Level;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.InetAddress;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Properties;
@@ -56,25 +44,8 @@ public class PulseAppListener implements ServletContextListener {
private static final Logger logger = LogManager.getLogger();
private final ResourceBundle resourceBundle = Repository.get().getResourceBundle();
- // String object to store all messages which needs to be logged into the log
- // file before logger gets initialized
- private String messagesToBeLogged = "";
-
private Properties pulseProperties;
private Properties pulseSecurityProperties;
- private Boolean sysPulseUseLocator;
- private String sysPulseHost;
- private String sysPulsePort;
- private String jmxUserName;
- private String jmxUserPassword;
-
- private boolean sysPulseUseSSLLocator;
- private boolean sysPulseUseSSLManager;
-
- // This property determines if pulse webApp login is authenticated against
- // GemFire integrated security or custom spring-security config provided
- // in pulse-authentication-custom.xml
- private boolean useGemFireCredentials;
@Override
public void contextDestroyed(ServletContextEvent event) {
@@ -89,36 +60,16 @@ public class PulseAppListener implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent event) {
-
- messagesToBeLogged = messagesToBeLogged
- .concat(formatLogString(resourceBundle.getString("LOG_MSG_CONTEXT_INITIALIZED")));
-
- // Load Pulse version details
- loadPulseVersionDetails();
-
+ logger.info(resourceBundle.getString("LOG_MSG_CONTEXT_INITIALIZED"));
// Load Pulse Properties
pulseProperties = loadProperties(PulseConstants.PULSE_PROPERTIES_FILE);
- if (pulseProperties.isEmpty()) {
- messagesToBeLogged = messagesToBeLogged
- .concat(formatLogString(resourceBundle.getString("LOG_MSG_PROPERTIES_NOT_FOUND")));
- } else {
- messagesToBeLogged = messagesToBeLogged
- .concat(formatLogString(resourceBundle.getString("LOG_MSG_PROPERTIES_FOUND")));
-
- // set Pulse product support into the Pulse controller for access from
- // client side
- // to display the appropriate ui depending on which product is supported
- // in present deployment
- String pulseProduct =
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_PRODUCTSUPPORT);
- }
+ // Load Pulse version details
+ loadPulseVersionDetails();
+ // load pulse security properties
pulseSecurityProperties = loadProperties(PulseConstants.PULSE_SECURITY_PROPERTIES_FILE);
- // Initialize logger
- initializeLogger();
-
// Reference to repository
Repository repository = Repository.get();
@@ -127,499 +78,79 @@ public class PulseAppListener implements ServletContextListener {
boolean sysIsEmbedded = Boolean.getBoolean(PulseConstants.SYSTEM_PROPERTY_PULSE_EMBEDDED);
if (sysIsEmbedded) {
- // Application Pulse is running in Embedded Mode
+ // jmx connection parameters
logger.info(resourceBundle.getString("LOG_MSG_APP_RUNNING_EMBEDDED_MODE"));
- repository.setIsEmbeddedMode(true);
-
- sysPulseUseLocator = Boolean.FALSE;
- try {
- // Get host name of machine running pulse in embedded mode
- sysPulseHost = InetAddress.getLocalHost().getCanonicalHostName();
- } catch (Exception e) {
- logger.debug(resourceBundle.getString("LOG_MSG_JMX_CONNECTION_UNKNOWN_HOST"), e);
- // Set default host name
- sysPulseHost = PulseConstants.GEMFIRE_DEFAULT_HOST;
- }
- sysPulsePort = System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_PORT);
- if (StringUtils.isBlank(sysPulsePort)) {
- sysPulsePort = PulseConstants.GEMFIRE_DEFAULT_PORT;
- }
-
+ repository.setJmxUseLocator(false);
+ repository.setHost(PulseConstants.GEMFIRE_DEFAULT_HOST);
+ repository.setPort(System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_PORT,
+ PulseConstants.GEMFIRE_DEFAULT_PORT));
+
+ // SSL, all the other system properties are already set in the embedded VM
+ repository.setUseSSLManager(
+ Boolean.valueOf(System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_MANAGER)));
+ repository.setUseSSLLocator(
+ Boolean.valueOf(System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_LOCATOR)));
} else {
- // Application Pulse is running in Non-Embedded Mode
+ // jmx connection parameters
logger.info(resourceBundle.getString("LOG_MSG_APP_RUNNING_NONEMBEDDED_MODE"));
- repository.setIsEmbeddedMode(false);
-
- // Load JMX User Details
- loadJMXUserDetails();
- // Load locator and/or manager details
- loadLocatorManagerDetails();
-
- useGemFireCredentials = areWeUsingGemFireSecurityProfile(event);
- }
-
- // Set user details in repository
- repository.setJmxUserName(jmxUserName);
- repository.setJmxUserPassword(jmxUserPassword);
-
- // Set locator/Manager details in repository
- repository.setJmxUseLocator(sysPulseUseLocator);
- repository.setJmxHost(sysPulseHost);
- repository.setJmxPort(sysPulsePort);
-
- // set SSL info
- initializeSSL();
- if (sysIsEmbedded) {
- sysPulseUseSSLManager = Boolean
- .parseBoolean(System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_MANAGER));
- }
- repository.setUseSSLLocator(sysPulseUseSSLLocator);
- repository.setUseSSLManager(sysPulseUseSSLManager);
-
- repository.setUseGemFireCredentials(useGemFireCredentials);
-
- }
-
- /**
- * Return true if pulse is configure to authenticate using gemfire integrated security
- *
- * @param event
- * @return
- */
- private boolean areWeUsingGemFireSecurityProfile(ServletContextEvent event) {
- String profile = null;
- WebApplicationContext ctx =
- WebApplicationContextUtils.getWebApplicationContext(event.getServletContext());
- if (ctx.getEnvironment() != null) {
- String[] profiles = ctx.getEnvironment().getActiveProfiles();
- if (profiles != null && profiles.length > 0) {
- StringBuilder sb = new StringBuilder();
- for (String p : profiles)
- sb.append(p).append(",");
- logger.info("#SpringProfilesConfigured : {}", sb);
- profile = ctx.getEnvironment().getActiveProfiles()[0];
- logger.info("#First Profile : {}", profile);
- } else {
- logger.info("No SpringProfileConfigured using default spring profile");
- return false;
- }
- }
- if (PulseConstants.APPLICATION_PROPERTY_PULSE_SEC_PROFILE_GEMFIRE.equals(profile)) {
- logger.info("Using gemfire integrated security profile");
- return true;
- }
- return false;
- }
-
- // Function to load pulse version details from properties file
- private void loadPulseVersionDetails() {
-
- // Read version details from version property file
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream =
- classLoader.getResourceAsStream(PulseConstants.PULSE_VERSION_PROPERTIES_FILE);
-
- if (inputStream != null) {
- Properties properties = new Properties();
- try {
- properties.load(inputStream);
- } catch (IOException e) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_EXCEPTION_LOADING_PROPERTIES_FILE")));
- } finally {
- try {
- inputStream.close();
- } catch (IOException e) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_EXCEPTION_CLOSING_INPUT_STREAM")));
- }
- }
- // Set pulse version details in common object
- PulseController.pulseVersion
- .setPulseVersion(properties.getProperty(PulseConstants.PROPERTY_PULSE_VERSION, ""));
- PulseController.pulseVersion
- .setPulseBuildId(properties.getProperty(PulseConstants.PROPERTY_BUILD_ID, ""));
- PulseController.pulseVersion
- .setPulseBuildDate(properties.getProperty(PulseConstants.PROPERTY_BUILD_DATE, ""));
- PulseController.pulseVersion
- .setPulseSourceDate(properties.getProperty(PulseConstants.PROPERTY_SOURCE_DATE, ""));
- PulseController.pulseVersion.setPulseSourceRevision(
- properties.getProperty(PulseConstants.PROPERTY_SOURCE_REVISION, ""));
- PulseController.pulseVersion.setPulseSourceRepository(
- properties.getProperty(PulseConstants.PROPERTY_SOURCE_REPOSITORY, ""));
- }
-
- // Log Pulse Version details into log file
- messagesToBeLogged = messagesToBeLogged
- .concat(formatLogString(PulseController.pulseVersion.getPulseVersionLogMessage()));
- }
-
- private void initializeLogger() {
-
- // Override default log configuration by properties which are provided in
- // properties file.
- loadLogDetailsFromPropertyFile();
-
- // Override log configuration by properties which are provided in
- // through system properties.
- loadLogDetailsFromSystemProperties();
-
- // Log messages stored in messagesToBeLogged
- logger.info(messagesToBeLogged);
- messagesToBeLogged = "";
- }
-
- // Function to load pulse properties from pulse.properties file
- private Properties loadProperties(String propertyFile) {
-
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = classLoader.getResourceAsStream(propertyFile);
- Properties properties = new Properties();
-
- if (inputStream != null) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(propertyFile + " " + resourceBundle.getString("LOG_MSG_FILE_FOUND")));
-
- try {
- // Load properties from input stream
- properties.load(inputStream);
- } catch (IOException e1) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_EXCEPTION_LOADING_PROPERTIES_FILE")
- + " " + propertyFile));
- } finally {
- // Close input stream
- try {
- inputStream.close();
- } catch (IOException e) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_EXCEPTION_CLOSING_INPUT_STREAM")
- + " " + propertyFile));
- }
- }
-
- } else {
- messagesToBeLogged = messagesToBeLogged.concat(formatLogString(
- resourceBundle.getString("LOG_MSG_COULD_NOT_READ_FILE") + " " + propertyFile));
- }
- return properties;
- }
-
- // Function to load Logging details from properties file
- private void loadLogDetailsFromPropertyFile() {
-
- // return, if Pulse Properties are not provided
- if (pulseProperties.size() == 0) {
- return;
- }
-
- messagesToBeLogged = messagesToBeLogged
- .concat(formatLogString(resourceBundle.getString("LOG_MSG_CHECK_LOG_PROPERTIES_IN_FILE")));
-
- HashMap<String, String> logPropertiesHM = new HashMap<String, String>();
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL, ""));
-
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND,
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND, ""));
-
- if (logPropertiesHM.size() == 0) {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_LOG_PROPERTIES_NOT_FOUND_IN_FILE")));
- } else {
- messagesToBeLogged = messagesToBeLogged.concat(
- formatLogString(resourceBundle.getString("LOG_MSG_LOG_PROPERTIES_FOUND_IN_FILE")));
- }
-
- setLogConfigurations(logPropertiesHM);
- }
-
- // Function to load Logging details from system properties
- private void loadLogDetailsFromSystemProperties() {
-
- messagesToBeLogged = messagesToBeLogged.concat(formatLogString(
- resourceBundle.getString("LOG_MSG_CHECK_LOG_PROPERTIES_IN_SYSTEM_PROPERTIES")));
-
- HashMap<String, String> logPropertiesHM = new HashMap<String, String>();
-
- String sysLogFileName =
- System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME);
- String sysLogFileLocation =
- System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION);
- String sysLogFileSize =
- System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE);
- String sysLogFileCount =
- System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT);
- String sysLogDatePattern =
- System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN);
- String sysLogLevel = System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL);
- String sysLogAppend = System.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND);
-
- if (sysLogFileName == null || sysLogFileName.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME, sysLogFileName);
- }
-
- if (sysLogFileLocation == null || sysLogFileLocation.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION,
- sysLogFileLocation);
- }
-
- if (sysLogFileSize == null || sysLogFileSize.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE, sysLogFileSize);
- }
-
- if (sysLogFileCount == null || sysLogFileCount.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT, sysLogFileCount);
- }
-
- if (sysLogDatePattern == null || sysLogDatePattern.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN,
- sysLogDatePattern);
- }
-
- if (sysLogLevel == null || sysLogLevel.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL, sysLogLevel);
- }
-
- if (sysLogAppend == null || sysLogAppend.isEmpty()) {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND, "");
- } else {
- logPropertiesHM.put(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND, sysLogAppend);
- }
-
- if (logPropertiesHM.size() == 0) {
- messagesToBeLogged = messagesToBeLogged.concat(formatLogString(
- resourceBundle.getString("LOG_MSG_LOG_PROPERTIES_NOT_FOUND_IN_SYSTEM_PROPERTIES")));
- } else {
- messagesToBeLogged = messagesToBeLogged.concat(formatLogString(
- resourceBundle.getString("LOG_MSG_LOG_PROPERTIES_FOUND_IN_SYSTEM_PROPERTIES")));
- }
-
- setLogConfigurations(logPropertiesHM);
- }
-
- private void setLogConfigurations(HashMap<String, String> logPropertiesHM) {
-
- PulseConfig pulseConfig = Repository.get().getPulseConfig();
-
- // log file name
- if (StringUtils
- .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME))) {
- pulseConfig.setLogFileName(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME));
- }
-
- // log file location
- if (StringUtils.isNotBlank(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION))) {
- pulseConfig.setLogFileLocation(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION));
- }
-
- // log file size
- if (StringUtils
- .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE))) {
- pulseConfig.setLogFileSize(Integer
- .parseInt(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE)));
- }
-
- // log file count
- if (StringUtils
- .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT))) {
- pulseConfig.setLogFileCount(Integer
- .parseInt(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT)));
- }
-
- // log message date pattern
- if (StringUtils.isNotBlank(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN))) {
- pulseConfig.setLogDatePattern(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN));
- }
-
- // log level
- if (StringUtils
- .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL))) {
- pulseConfig.setLogLevel(Level.getLevel(
- logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL).toUpperCase()));
- }
-
- // log append
- if (StringUtils
- .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND))) {
- pulseConfig.setLogAppend(Boolean
- .valueOf(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND)));
- }
-
- }
-
- // Function to load JMX User details from properties
- private void loadJMXUserDetails() {
- logger.info(resourceBundle.getString("LOG_MSG_GET_JMX_USER_DETAILS"));
-
- if (pulseProperties.isEmpty()) {
- logger.info("{}{}", resourceBundle.getString("LOG_MSG_JMX_USER_DETAILS_NOT_FOUND"),
- resourceBundle.getString("LOG_MSG_REASON_USER_DETAILS_NOT_FOUND"));
- } else {
- jmxUserName =
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_JMXUSERNAME, "");
- jmxUserPassword =
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_JMXPASSWORD, "");
-
- if (jmxUserName.isEmpty() || jmxUserPassword.isEmpty()) {
- logger.info("{}{}", resourceBundle.getString("LOG_MSG_JMX_USER_DETAILS_NOT_FOUND"),
- resourceBundle.getString("LOG_MSG_REASON_USER_DETAILS_NOT_FOUND"));
- } else {
- logger.info(resourceBundle.getString("LOG_MSG_JMX_USER_DETAILS_FOUND"));
- }
- }
- }
-
- // Function to set SSL VM arguments
- private void initializeSSL() {
- logger.info(resourceBundle.getString("LOG_MSG_GET_SSL_DETAILS"));
-
-
- this.sysPulseUseSSLLocator = Boolean.valueOf(
- pulseProperties.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_LOCATOR, "false"));
-
- this.sysPulseUseSSLManager = Boolean.valueOf(
- pulseProperties.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_MANAGER, "false"));
-
-
- if ((sysPulseUseSSLLocator || sysPulseUseSSLManager)) {
- Properties sslProperties = new Properties();
+ repository.setJmxUseLocator(Boolean.valueOf(
+ pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_USELOCATOR)));
+ repository.setHost(pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_HOST,
+ PulseConstants.GEMFIRE_DEFAULT_HOST));
+ repository.setPort(pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_PORT,
+ PulseConstants.GEMFIRE_DEFAULT_PORT));
+
+ // SSL
+ repository.setUseSSLManager(Boolean.valueOf(pulseProperties
+ .getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_MANAGER, "false")));
+ repository.setUseSSLLocator(Boolean.valueOf(pulseProperties
+ .getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_USESSL_LOCATOR, "false")));
+
+ // set the ssl related properties found in pulsesecurity.properties
if (!pulseSecurityProperties.isEmpty()) {
Set entrySet = pulseSecurityProperties.entrySet();
for (Iterator it = entrySet.iterator(); it.hasNext();) {
Entry<String, String> entry = (Entry<String, String>) it.next();
String key = entry.getKey();
if (key.startsWith("javax.net.ssl.")) {
-
String val = entry.getValue();
System.setProperty(key, val);
- sslProperties.setProperty(key, val);
}
}
}
- if (sslProperties.isEmpty()) {
- logger.warn(resourceBundle.getString("LOG_MSG_SSL_NOT_SET"));
- }
}
-
}
- // Function to load locator and/or manager details
- private void loadLocatorManagerDetails() {
-
- // Get locator details through System Properties
- logger.info(resourceBundle.getString("LOG_MSG_GET_LOCATOR_DETAILS_1"));
-
- // Required System properties are
- // -Dpulse.embedded="false" -Dpulse.useLocator="false"
- // -Dpulse.host="192.168.2.11" -Dpulse.port="2099"
- sysPulseUseLocator = Boolean.getBoolean(PulseConstants.SYSTEM_PROPERTY_PULSE_USELOCATOR);
- sysPulseHost = System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_HOST);
- sysPulsePort = System.getProperty(PulseConstants.SYSTEM_PROPERTY_PULSE_PORT);
-
- if (sysPulseHost == null || sysPulseHost.isEmpty() || sysPulsePort == null
- || sysPulsePort.isEmpty()) {
- logger.info("{}{}", resourceBundle.getString("LOG_MSG_LOCATOR_DETAILS_NOT_FOUND"),
- resourceBundle.getString("LOG_MSG_REASON_LOCATOR_DETAILS_NOT_FOUND_1"));
- logger.info(resourceBundle.getString("LOG_MSG_GET_LOCATOR_DETAILS_2"));
-
- if (pulseProperties.isEmpty()) {
- logger.info("{}{}", resourceBundle.getString("LOG_MSG_LOCATOR_DETAILS_NOT_FOUND"),
- resourceBundle.getString("LOG_MSG_REASON_LOCATOR_DETAILS_NOT_FOUND_2"));
-
- sysPulseHost = "";
- sysPulsePort = "";
- } else {
- logger.info(resourceBundle.getString("LOG_MSG_LOCATOR_DETAILS_FOUND"));
-
- sysPulseUseLocator = Boolean.valueOf(
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_USELOCATOR, ""));
- sysPulseHost =
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_HOST, "");
- sysPulsePort =
- pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_PORT, "");
- }
- } else {
- logger.info(resourceBundle.getString("LOG_MSG_LOCATOR_DETAILS_FOUND"));
- }
+ // Function to load pulse version details from properties file
+ private void loadPulseVersionDetails() {
+ Properties properties = loadProperties(PulseConstants.PULSE_VERSION_PROPERTIES_FILE);
+ // Set pulse version details in common object
+ PulseController.pulseVersion
+ .setPulseVersion(properties.getProperty(PulseConstants.PROPERTY_PULSE_VERSION, ""));
+ PulseController.pulseVersion
+ .setPulseBuildId(properties.getProperty(PulseConstants.PROPERTY_BUILD_ID, ""));
+ PulseController.pulseVersion
+ .setPulseBuildDate(properties.getProperty(PulseConstants.PROPERTY_BUILD_DATE, ""));
+ PulseController.pulseVersion
+ .setPulseSourceDate(properties.getProperty(PulseConstants.PROPERTY_SOURCE_DATE, ""));
+ PulseController.pulseVersion.setPulseSourceRevision(
+ properties.getProperty(PulseConstants.PROPERTY_SOURCE_REVISION, ""));
+ PulseController.pulseVersion.setPulseSourceRepository(
+ properties.getProperty(PulseConstants.PROPERTY_SOURCE_REPOSITORY, ""));
+ logger.info(PulseController.pulseVersion.getPulseVersionLogMessage());
}
- private String formatLogString(String logMessage) {
-
- DateFormat df = new SimpleDateFormat(PulseConstants.LOG_MESSAGE_DATE_PATTERN);
- // DateFormat df = new
- // SimpleDateFormat(Repository.get().getPulseConfig().getLogDatePattern());
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
-
- pw.println();
- pw.print("[");
- pw.print("INFO");
- pw.print(" ");
- pw.print(df.format(new Date(System.currentTimeMillis())));
- String threadName = Thread.currentThread().getName();
- if (threadName != null) {
- pw.print(" ");
- pw.print(threadName);
- }
- pw.print(" tid=0x");
- pw.print(Long.toHexString(Thread.currentThread().getId()));
- pw.print("] ");
- pw.print("(msgTID=");
- pw.print("");
-
- pw.print(" msgSN=");
- pw.print("");
-
- pw.print(") ");
-
- pw.println("[" + PulseConstants.APP_NAME + "]");
-
- pw.println(Logger.class.getName());
-
- pw.println(logMessage);
-
- pw.close();
- try {
- sw.close();
- } catch (IOException ignore) {
+ // Function to load pulse properties from pulse.properties file
+ private Properties loadProperties(String propertyFile) {
+ final Properties properties = new Properties();
+ try (final InputStream stream =
+ Thread.currentThread().getContextClassLoader().getResourceAsStream(propertyFile)) {
+ logger.info(propertyFile + " " + resourceBundle.getString("LOG_MSG_FILE_FOUND"));
+ properties.load(stream);
+ } catch (IOException e) {
+ logger.error(resourceBundle.getString("LOG_MSG_EXCEPTION_LOADING_PROPERTIES_FILE"), e);
}
- String result = sw.toString();
- return result;
+ return properties;
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
index c878879..e609477 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
@@ -149,14 +149,6 @@ public class PulseController {
ObjectNode responseJSON = mapper.createObjectNode();
try {
- // Reference to repository
- Repository repository = Repository.get();
- // set pulse web app url
- String pulseWebAppUrl = request.getScheme() + "://" + request.getServerName() + ":"
- + request.getServerPort() + request.getContextPath();
-
- repository.setPulseWebAppUrl(pulseWebAppUrl);
-
// Response
responseJSON.put("pulseVersion", PulseController.pulseVersion.getPulseVersion());
responseJSON.put("buildId", PulseController.pulseVersion.getPulseBuildId());
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
index 78e92d4..5b552a1 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
@@ -34,7 +34,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.net.ConnectException;
import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -71,9 +70,9 @@ public class Cluster extends Thread {
private final ResourceBundle resourceBundle = Repository.get().getResourceBundle();
private String jmxUserName;
- private String jmxUserPassword;
private String serverName;
private String port;
+ private JMXConnector jmxConnector;
private int stale = 0;
private double loadPerSec;
private CountDownLatch clusterHasBeenInitialized;
@@ -2276,19 +2275,14 @@ public class Cluster extends Thread {
* @param host host name
* @param port port
* @param userName pulse user name
- * @param userPassword pulse user password
- * @throws ConnectException
*/
- public Cluster(String host, String port, String userName, String userPassword)
- throws ConnectException {
+ public Cluster(String host, String port, String userName) {
this.serverName = host;
this.port = port;
this.jmxUserName = userName;
- this.jmxUserPassword = userPassword;
this.updater = ClusterDataFactory.getUpdater(this, host, port);
this.clusterHasBeenInitialized = new CountDownLatch(1);
- // start();
}
public void waitForInitialization(long timeout, TimeUnit unit) throws InterruptedException {
@@ -2385,18 +2379,6 @@ public class Cluster extends Thread {
return this.jmxUserName;
}
- public void setJmxUserName(String jmxUserName) {
- this.jmxUserName = jmxUserName;
- }
-
- public String getJmxUserPassword() {
- return this.jmxUserPassword;
- }
-
- public void setJmxUserPassword(String jmxUserPassword) {
- this.jmxUserPassword = jmxUserPassword;
- }
-
public String getConnectionErrorMsg() {
return this.connectionErrorMsg;
}
@@ -2818,14 +2800,25 @@ public class Cluster extends Thread {
return this.getDataBrowser().deleteQueryById(userId, queryId);
}
- public JMXConnector connectToGemFire() {
- if (this.updater instanceof JMXDataUpdater) {
- return ((JMXDataUpdater) this.updater).getJMXConnection(false);
- } else {
- return null;
+ public void connectToGemFire(String password) {
+ jmxConnector = this.updater.connect(this.getJmxUserName(), password);
+
+ // if connected
+ if (jmxConnector != null) {
+ // Start Thread
+ this.start();
+ try {
+ this.waitForInitialization(15, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
}
+ public JMXConnector getJMXConnector() {
+ return this.jmxConnector;
+ }
+
/**
* inner class for creating Mock Data
*
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
index 3ec8207..fb837ea 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/IClusterUpdater.java
@@ -19,6 +19,8 @@ package org.apache.geode.tools.pulse.internal.data;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.management.remote.JMXConnector;
+
/**
* Interface having updateData() function which is getting Override by both MockDataUpdater and
* JMXDataUpdater
@@ -30,4 +32,8 @@ public interface IClusterUpdater {
boolean updateData();
ObjectNode executeQuery(String queryText, String members, int limit);
+
+ default JMXConnector connect(String username, String password) {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
index c74e3cd..2da74f1 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
import java.math.BigDecimal;
import java.net.Inet4Address;
import java.net.Inet6Address;
@@ -49,7 +48,6 @@ import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.IntrospectionException;
-import javax.management.InvalidAttributeValueException;
import javax.management.MBeanException;
import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
@@ -75,7 +73,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
private final ResourceBundle resourceBundle = Repository.get().getResourceBundle();
private JMXConnector conn = null;
- private MBeanServerConnection mbs;
+ private MBeanServerConnection mbs = null;
private final String serverName;
private final String port;
private Boolean isAddedNotiListner = false;
@@ -87,7 +85,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
private ObjectName MBEAN_OBJECT_NAME_MEMBER;
private ObjectName MBEAN_OBJECT_NAME_MEMBER_MANAGER;
private ObjectName MBEAN_OBJECT_NAME_STATEMENT_DISTRIBUTED;
- private ObjectName MBEAN_OBJECT_NAME_TABLE_AGGREGATE;
private Set<ObjectName> systemMBeans = null;
@@ -124,10 +121,10 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
private JmxManagerInfo getManagerInfoFromLocator(Repository repository) {
try {
- String locatorHost = repository.getJmxHost();
- int locatorPort = Integer.parseInt(repository.getJmxPort());
+ String locatorHost = repository.getHost();
+ int locatorPort = Integer.parseInt(repository.getPort());
- logger.info("{} : {} & {} : {}", resourceBundle.getString("LOG_MSG_HOST"), locatorHost,
+ logger.info("{}={} & {}={}", resourceBundle.getString("LOG_MSG_HOST"), locatorHost,
resourceBundle.getString("LOG_MSG_PORT"), locatorPort);
InetAddress inetAddr = InetAddress.getByName(locatorHost);
@@ -135,11 +132,9 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
if ((inetAddr instanceof Inet4Address) || (inetAddr instanceof Inet6Address)) {
if (inetAddr instanceof Inet4Address) {
- logger.info("{} - {}", resourceBundle.getString("LOG_MSG_LOCATOR_IPV4_ADDRESS"),
- inetAddr);
+ logger.info("{}: {}", resourceBundle.getString("LOG_MSG_LOCATOR_IPV4_ADDRESS"), inetAddr);
} else {
- logger.info("{} - {}", resourceBundle.getString("LOG_MSG_LOCATOR_IPV6_ADDRESS"),
- inetAddr);
+ logger.info("{}: {}", resourceBundle.getString("LOG_MSG_LOCATOR_IPV6_ADDRESS"), inetAddr);
}
JmxManagerInfo jmxManagerInfo = JmxManagerFinder.askLocatorForJmxManager(inetAddr,
@@ -168,19 +163,11 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
return null;
}
- /**
- * Default connection is Pulse which uses configured userName and password
- */
- public JMXConnector getJMXConnection() {
- return getJMXConnection(true);
- }
/**
- * Get connection for given userName and password. This is used for DataBrowser queries which has
- * to be fired using credentials provided at pulse login page
+ * Get the jmx connection
*/
- public JMXConnector getJMXConnection(final boolean registerURL) {
- JMXConnector connection = null;
+ public JMXConnector connect(String username, String password) {
// Reference to repository
Repository repository = Repository.get();
try {
@@ -196,7 +183,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
if (jmxManagerInfo.port == 0) {
logger.info(resourceBundle.getString("LOG_MSG_LOCATOR_COULD_NOT_FIND_MANAGER"));
} else {
- logger.info("{} : {} : {} & {} : {}{}",
+ logger.info("{}: {}={} & {}={}, {}",
resourceBundle.getString("LOG_MSG_LOCATOR_FOUND_MANAGER"),
resourceBundle.getString("LOG_MSG_HOST"), jmxManagerInfo.host,
resourceBundle.getString("LOG_MSG_PORT"), jmxManagerInfo.port,
@@ -207,14 +194,14 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
formJMXServiceURLString(jmxManagerInfo.host, String.valueOf(jmxManagerInfo.port));
}
} else {
- logger.info("{} : {} & {} : {}", resourceBundle.getString("LOG_MSG_HOST"), this.serverName,
+ logger.info("{}={} & {}={}", resourceBundle.getString("LOG_MSG_HOST"), this.serverName,
resourceBundle.getString("LOG_MSG_PORT"), this.port);
jmxSerURL = formJMXServiceURLString(this.serverName, this.port);
}
if (StringUtils.isNotBlank(jmxSerURL)) {
JMXServiceURL url = new JMXServiceURL(jmxSerURL);
- String[] creds = {this.cluster.getJmxUserName(), this.cluster.getJmxUserPassword()};
+ String[] creds = {username, password};
Map<String, Object> env = new HashMap<String, Object>();
env.put(JMXConnector.CREDENTIALS, creds);
@@ -223,33 +210,24 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
env.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());
}
logger.info("Connecting to jmxURL : {}", jmxSerURL);
- connection = JMXConnectorFactory.connect(url, env);
-
- // Register Pulse URL if not already present in the JMX Manager
- if (registerURL) {
- registerPulseUrlToManager(connection);
- }
+ this.conn = JMXConnectorFactory.connect(url, env);
+ this.mbs = this.conn.getMBeanServerConnection();
+ cluster.setConnectedFlag(true);
}
} catch (Exception e) {
- if (e instanceof UnknownHostException) {
- cluster
- .setConnectionErrorMsg(resourceBundle.getString("LOG_MSG_JMX_CONNECTION_UNKNOWN_HOST"));
- }
-
- StringWriter swBuffer = new StringWriter();
- PrintWriter prtWriter = new PrintWriter(swBuffer);
- e.printStackTrace(prtWriter);
- logger.fatal("Exception Details : {}\n", swBuffer);
+ cluster.setConnectedFlag(false);
+ cluster.setConnectionErrorMsg(e.getMessage());
+ logger.fatal(e.getMessage(), e);
if (this.conn != null) {
try {
this.conn.close();
} catch (Exception e1) {
- logger.fatal("Error closing JMX connection {}\n", swBuffer);
+ logger.fatal(e1.getMessage(), e1);
}
this.conn = null;
}
}
- return connection;
+ return this.conn;
}
private String formJMXServiceURLString(String host, String port) throws UnknownHostException {
@@ -276,92 +254,13 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
return jmxSerURL;
}
- // Method registers Pulse URL if not already present in the JMX Manager
- private void registerPulseUrlToManager(JMXConnector connection)
- throws IOException, AttributeNotFoundException, InstanceNotFoundException, MBeanException,
- ReflectionException, MalformedObjectNameException, InvalidAttributeValueException {
- logger.info(resourceBundle.getString("LOG_MSG_REGISTERING_APP_URL_TO_MANAGER"));
-
- // Reference to repository
- Repository repository = Repository.get();
-
- // Register Pulse URL if not already present in the JMX Manager
- if (connection != null) {
- MBeanServerConnection mbsc = connection.getMBeanServerConnection();
-
- Set<ObjectName> mbeans = mbsc.queryNames(this.MBEAN_OBJECT_NAME_MEMBER_MANAGER, null);
-
- for (ObjectName mbeanName : mbeans) {
- String presentUrl =
- (String) mbsc.getAttribute(mbeanName, PulseConstants.MBEAN_MANAGER_ATTRIBUTE_PULSEURL);
- String pulseWebAppUrl = repository.getPulseWebAppUrl();
- if (pulseWebAppUrl != null && (presentUrl == null || !pulseWebAppUrl.equals(presentUrl))) {
- logger.debug(resourceBundle.getString("LOG_MSG_SETTING_APP_URL_TO_MANAGER"));
- Attribute pulseUrlAttr =
- new Attribute(PulseConstants.MBEAN_MANAGER_ATTRIBUTE_PULSEURL, pulseWebAppUrl);
- mbsc.setAttribute(mbeanName, pulseUrlAttr);
- } else {
- logger.debug(resourceBundle.getString("LOG_MSG_APP_URL_ALREADY_PRESENT_IN_MANAGER"));
- }
- }
- }
- }
-
- private boolean isConnected() {
- // Reference to repository
- Repository repository = Repository.get();
- if (repository.getIsEmbeddedMode()) {
- if (this.mbs == null) {
- this.mbs = ManagementFactory.getPlatformMBeanServer();
- cluster.setConnectedFlag(true);
- }
- } else {
- try {
- if (this.conn == null) {
- cluster.setConnectedFlag(false);
- cluster.setConnectionErrorMsg(resourceBundle.getString("LOG_MSG_JMX_CONNECTION_NOT_FOUND")
- + " " + resourceBundle.getString("LOG_MSG_JMX_GETTING_NEW_CONNECTION"));
- logger.debug("{} {}", resourceBundle.getString("LOG_MSG_JMX_CONNECTION_NOT_FOUND"),
- resourceBundle.getString("LOG_MSG_JMX_GET_NEW_CONNECTION"));
- this.conn = getJMXConnection();
- if (this.conn != null) {
- this.mbs = this.conn.getMBeanServerConnection();
- cluster.setConnectedFlag(true);
- } else {
- logger.info(resourceBundle.getString("LOG_MSG_JMX_CONNECTION_NOT_FOUND"));
- return false;
- }
- } else {
- logger.debug(resourceBundle.getString("LOG_MSG_JMX_CONNECTION_IS_AVAILABLE"));
- cluster.setConnectedFlag(true);
- if (this.mbs == null) {
- this.mbs = this.conn.getMBeanServerConnection();
- }
- }
- } catch (Exception e) {
- this.mbs = null;
- if (this.conn != null) {
- try {
- this.conn.close();
- } catch (Exception e1) {
- logger.fatal(e);
- }
- }
- this.conn = null;
- return false;
- }
- }
-
- return true;
- }
-
/**
* function used for updating Cluster Data.
*/
@Override
public boolean updateData() {
try {
- if (!this.isConnected()) {
+ if (this.conn == null) {
return false;
}
@@ -377,9 +276,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
cluster.getDeletedRegions().add(region.getFullPath());
}
- // try {
-
- // Cluster
this.systemMBeans = this.mbs.queryNames(this.MBEAN_OBJECT_NAME_SYSTEM_DISTRIBUTED, null);
for (ObjectName sysMBean : this.systemMBeans) {
updateClusterSystem(sysMBean);
@@ -389,9 +285,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
Set<ObjectName> regionMBeans =
this.mbs.queryNames(this.MBEAN_OBJECT_NAME_REGION_DISTRIBUTED, null);
- Set<ObjectName> tableMBeans =
- this.mbs.queryNames(this.MBEAN_OBJECT_NAME_TABLE_AGGREGATE, null);
-
// For Gemfire
for (ObjectName regMBean : regionMBeans) {
updateClusterRegion(regMBean);
@@ -440,19 +333,15 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
updateClusterStatement(stmtObjectName);
}
} catch (IOException ioe) {
-
- // write errors
- StringWriter swBuffer = new StringWriter();
- PrintWriter prtWriter = new PrintWriter(swBuffer);
- ioe.printStackTrace(prtWriter);
- logger.fatal("IOException Details : {}\n", swBuffer);
+ logger.fatal(ioe.getMessage(), ioe);
this.mbs = null;
if (this.conn != null) {
try {
this.conn.close();
} catch (IOException e1) {
- logger.fatal("Error closing JMX connection {}\n", swBuffer);
+ logger.fatal(e1.getMessage(), e1);
}
+ this.conn = null;
}
return false;
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
index 52e13a7..c3a33fd 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Repository.java
@@ -22,13 +22,11 @@ import org.apache.logging.log4j.Logger;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
-import java.net.ConnectException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import java.util.concurrent.TimeUnit;
/**
* A Singleton instance of the memory cache for clusters.
@@ -41,17 +39,10 @@ public class Repository {
private static Repository instance = new Repository();
private HashMap<String, Cluster> clusterMap = new HashMap<String, Cluster>();
private Boolean jmxUseLocator;
- private String jmxHost;
- private String jmxPort;
- private String jmxUserName;
- private String jmxUserPassword;
- private Boolean isEmbeddedMode;
+ private String host;
+ private String port;
private boolean useSSLLocator = false;
private boolean useSSLManager = false;
- private boolean useGemFireCredentials = false;
-
-
- private String pulseWebAppUrl;
Locale locale =
new Locale(PulseConstants.APPLICATION_LANGUAGE, PulseConstants.APPLICATION_COUNTRY);
@@ -77,44 +68,20 @@ public class Repository {
this.jmxUseLocator = jmxUseLocator;
}
- public String getJmxHost() {
- return this.jmxHost;
- }
-
- public void setJmxHost(String jmxHost) {
- this.jmxHost = jmxHost;
- }
-
- public String getJmxPort() {
- return this.jmxPort;
- }
-
- public void setJmxPort(String jmxPort) {
- this.jmxPort = jmxPort;
+ public String getHost() {
+ return this.host;
}
- public String getJmxUserName() {
- return this.jmxUserName;
+ public void setHost(String jmxHost) {
+ this.host = jmxHost;
}
- public void setJmxUserName(String jmxUserName) {
- this.jmxUserName = jmxUserName;
+ public String getPort() {
+ return this.port;
}
- public String getJmxUserPassword() {
- return this.jmxUserPassword;
- }
-
- public void setJmxUserPassword(String jmxUserPassword) {
- this.jmxUserPassword = jmxUserPassword;
- }
-
- public Boolean getIsEmbeddedMode() {
- return this.isEmbeddedMode;
- }
-
- public void setIsEmbeddedMode(Boolean isEmbeddedMode) {
- this.isEmbeddedMode = isEmbeddedMode;
+ public void setPort(String jmxPort) {
+ this.port = jmxPort;
}
public boolean isUseSSLLocator() {
@@ -133,79 +100,42 @@ public class Repository {
this.useSSLManager = useSSLManager;
}
- public String getPulseWebAppUrl() {
- return this.pulseWebAppUrl;
- }
-
- public void setPulseWebAppUrl(String pulseWebAppUrl) {
- this.pulseWebAppUrl = pulseWebAppUrl;
- }
-
public PulseConfig getPulseConfig() {
return this.pulseConfig;
}
- public void setPulseConfig(PulseConfig pulseConfig) {
- this.pulseConfig = pulseConfig;
- }
/**
- * we're maintaining a 1:1 mapping between webapp and cluster, there is no need for a map of
- * clusters based on the host and port We are using this clusterMap to maintain cluster for
- * different users now. For a single-user connection to gemfire JMX, we will use the default
- * username/password in the pulse.properties (# JMX User Properties ) pulse.jmxUserName=admin
- * pulse.jmxUserPassword=admin
+ * this will return a cluster already connected to the geode jmx manager for the user in the
+ * request
*
* But for multi-user connections to gemfireJMX, i.e pulse that uses gemfire integrated security,
* we will need to get the username form the context
*/
public Cluster getCluster() {
- String username = null;
- String password = null;
- if (useGemFireCredentials) {
- Authentication auth = SecurityContextHolder.getContext().getAuthentication();
- if (auth != null) {
- username = auth.getName();
- password = (String) auth.getCredentials();
- }
- } else {
- username = this.jmxUserName;
- password = this.jmxUserPassword;
- }
- return this.getCluster(username, password);
+ Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+ if (auth == null)
+ return null;
+ return getCluster(auth.getName(), null);
}
public Cluster getCluster(String username, String password) {
synchronized (this.clusterMap) {
- String key = username;
- Cluster data = this.clusterMap.get(key);
-
+ Cluster data = clusterMap.get(username);
if (data == null) {
- try {
- logger.info("{} : {}", resourceBundle.getString("LOG_MSG_CREATE_NEW_THREAD"), key);
- data = new Cluster(this.jmxHost, this.jmxPort, username, password);
- // Assign name to thread created
- data.setName(
- PulseConstants.APP_NAME + "-" + this.jmxHost + ":" + this.jmxPort + ":" + username);
- // Start Thread
- data.start();
- data.waitForInitialization(15, TimeUnit.SECONDS);
- this.clusterMap.put(key, data);
- } catch (ConnectException | InterruptedException e) {
- data = null;
- logger.debug(e);
+ logger.info(resourceBundle.getString("LOG_MSG_CREATE_NEW_THREAD") + " : " + username);
+ data = new Cluster(this.host, this.port, username);
+ // Assign name to thread created
+ data.setName(PulseConstants.APP_NAME + "-" + this.host + ":" + this.port + ":" + username);
+ data.connectToGemFire(password);
+ if (data.isConnectedFlag()) {
+ this.clusterMap.put(username, data);
}
- } else {
- data.setJmxUserPassword(password);
-
}
return data;
}
}
- private String getClusterKey(String host, String port) {
- return host + ":" + port;
- }
// This method is used to remove all cluster threads
public void removeAllClusters() {
@@ -226,14 +156,5 @@ public class Repository {
return this.resourceBundle;
}
- public boolean isUseGemFireCredentials() {
- return useGemFireCredentials;
- }
-
- public void setUseGemFireCredentials(boolean useGemFireCredentials) {
- this.useGemFireCredentials = useGemFireCredentials;
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
index 096bf6f..2b110bc 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/GemFireAuthenticationProvider.java
@@ -14,21 +14,19 @@
*/
package org.apache.geode.tools.pulse.internal.security;
-import java.util.Collection;
-import javax.management.remote.JMXConnector;
-
import org.apache.geode.tools.pulse.internal.data.Repository;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.GrantedAuthority;
+import java.util.Collection;
+import javax.management.remote.JMXConnector;
+
/**
* Spring security AuthenticationProvider for GemFire. It connects to gemfire manager using given
* credentials. Successful connect is treated as successful authentication and web user is
@@ -44,7 +42,6 @@ public class GemFireAuthenticationProvider implements AuthenticationProvider {
@Override
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-
if (authentication instanceof GemFireAuthentication) {
GemFireAuthentication gemAuth = (GemFireAuthentication) authentication;
logger.debug("GemAuthentication is connected? = {}", gemAuth.getJmxc());
@@ -55,21 +52,17 @@ public class GemFireAuthenticationProvider implements AuthenticationProvider {
String name = authentication.getName();
String password = authentication.getCredentials().toString();
- try {
- logger.debug("Connecting to GemFire with user={}", name);
- JMXConnector jmxc = Repository.get().getCluster(name, password).connectToGemFire();
- if (jmxc != null) {
- Collection<GrantedAuthority> list = GemFireAuthentication.populateAuthorities(jmxc);
- GemFireAuthentication auth = new GemFireAuthentication(authentication.getPrincipal(),
- authentication.getCredentials(), list, jmxc);
- logger.debug("For user " + name + " authList={}", list);
- return auth;
- } else {
- throw new AuthenticationServiceException("JMX Connection unavailable");
- }
- } catch (Exception e) {
- throw new BadCredentialsException("Error connecting to GemFire JMX Server", e);
+ logger.debug("Connecting to GemFire with user=" + name);
+ JMXConnector jmxc = Repository.get().getCluster(name, password).getJMXConnector();
+ if (jmxc == null) {
+ throw new BadCredentialsException("Error connecting to GemFire JMX Server");
}
+
+ Collection<GrantedAuthority> list = GemFireAuthentication.populateAuthorities(jmxc);
+ GemFireAuthentication auth = new GemFireAuthentication(authentication.getPrincipal(),
+ authentication.getCredentials(), list, jmxc);
+ logger.debug("For user " + name + " authList=" + list);
+ return auth;
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
index b169d4f..d685964 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/security/LogoutHandler.java
@@ -14,19 +14,17 @@
*/
package org.apache.geode.tools.pulse.internal.security;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geode.tools.pulse.internal.data.Repository;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Handler is used to close jmx connection maintained at user-level
*
@@ -41,12 +39,10 @@ public class LogoutHandler extends SimpleUrlLogoutSuccessHandler implements Logo
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response,
Authentication authentication) throws IOException, ServletException {
logger.debug("Invoked #LogoutHandler ...");
- if (Repository.get().isUseGemFireCredentials()) {
- GemFireAuthentication gemauthentication = (GemFireAuthentication) authentication;
- if (gemauthentication != null) {
- gemauthentication.getJmxc().close();
- logger.info("#LogoutHandler : Closing GemFireAuthentication JMX Connection...");
- }
+ GemFireAuthentication gemauthentication = (GemFireAuthentication) authentication;
+ if (gemauthentication != null) {
+ gemauthentication.getJmxc().close();
+ logger.info("#LogoutHandler : Closing GemFireAuthentication JMX Connection...");
}
super.onLogoutSuccess(request, response, authentication);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
index b6a129d..34a7734 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
@@ -20,7 +20,6 @@ package org.apache.geode.tools.pulse.internal.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.geode.tools.pulse.internal.controllers.PulseController;
import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.tools.pulse.internal.data.Repository;
@@ -32,7 +31,6 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
index 90d4ecd..7a1013a 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
@@ -17,23 +17,21 @@
package org.apache.geode.tools.pulse.internal.service;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.geode.tools.pulse.internal.data.Cluster;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.internal.data.Repository;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
-import org.apache.geode.tools.pulse.internal.data.Cluster;
-import org.apache.geode.tools.pulse.internal.data.PulseConstants;
-import org.apache.geode.tools.pulse.internal.data.Repository;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
/**
* Class ClusterMembersRGraphService
@@ -95,7 +93,7 @@ public class ClusterMembersRGraphService implements PulseService {
// cluster's Members
responseJSON.put(this.CLUSTER,
- getPhysicalServerJson(cluster, repository.getJmxHost(), repository.getJmxPort()));
+ getPhysicalServerJson(cluster, repository.getHost(), repository.getPort()));
responseJSON.put(this.MEMBER_COUNT, cluster.getMemberCount());
// Send json response
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/resources/log4j2.xml b/geode-pulse/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..536a045
--- /dev/null
+++ b/geode-pulse/src/main/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<Configuration status="INFO" name="Pulse" packages="org.apache.geode">
+ <Appenders>
+ <File name="File" fileName="pulse.log">
+ <PatternLayout>
+ <Pattern>%d %p %c{1.} [%t] %m%n</Pattern>
+ </PatternLayout>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Root level="INFO">
+ <AppenderRef ref="File"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/main/resources/pulse.properties
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/resources/pulse.properties b/geode-pulse/src/main/resources/pulse.properties
index d47d469..6eb4730 100644
--- a/geode-pulse/src/main/resources/pulse.properties
+++ b/geode-pulse/src/main/resources/pulse.properties
@@ -21,28 +21,9 @@
#Tue, 09 Oct 2012 16:39:00
# JMX Locator/Manager Properties
-pulse.useLocator=false
+pulse.useLocator=true
pulse.host=localhost
-pulse.port=1099
+pulse.port=10334
#pulse.useSSL.locator=true
#pulse.useSSL.manager=true
-
-# JMX User Properties
-pulse.jmxUserName=admin
-pulse.jmxUserPassword=admin
-
-# Logging Configurations Properties
-pulse.Log-File-Name=PULSELOG
-#pulse.Log-File-Location=F:\\PulseLogs
-pulse.Log-File-Size=1048576
-pulse.Log-File-Count=3
-pulse.Log-Date-Pattern=yyyy/MM/dd HH:mm:ss.SSS z
-pulse.Log-Level=info
-pulse.Log-Append=true
-
-# For supporting gemfire and sqlfire both in pulse
-# valid values are as follows
-# for GemFire "gemfire"
-# for GemFireXD "gemfirexd"
-pulse.product=gemfire
http://git-wip-us.apache.org/repos/asf/geode/blob/0f978a6d/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
index ddd799f..58bdbcb 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.tools.pulse.controllers;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -29,14 +28,9 @@ import java.io.File;
import java.security.Principal;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.UUID;
-import javax.servlet.ServletContextListener;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.geode.tools.pulse.internal.PulseAppListener;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.tools.pulse.internal.controllers.PulseController;
import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.internal.data.PulseConfig;
[31/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
index b4f882e..17894ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ObjIdConcurrentMap.java
@@ -186,7 +186,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
* Segment.readValueUnderLock method is used as a backup in case a null (pre-initialized) value is
* ever seen in an unsynchronized access method.
*/
- static final class HashEntry<V> {
+ static class HashEntry<V> {
final int key;
final int hash;
volatile V value;
@@ -200,7 +200,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
}
@SuppressWarnings("unchecked")
- static final <V> HashEntry<V>[] newArray(int i) {
+ static <V> HashEntry<V>[] newArray(int i) {
return new HashEntry[i];
}
}
@@ -209,7 +209,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
* Segments are specialized versions of hash tables. This subclasses from ReentrantLock
* opportunistically, just to simplify some locking and avoid separate construction.
*/
- static final class Segment<V> extends ReentrantLock implements Serializable {
+ static class Segment<V> extends ReentrantLock implements Serializable {
/*
* Segments maintain a table of entry lists that are ALWAYS kept in a consistent state, so can
* be read without locking. Next fields of nodes are immutable (final). All list additions are
@@ -279,7 +279,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
}
@SuppressWarnings("unchecked")
- static final <K, V> Segment<V>[] newArray(int i) {
+ static <K, V> Segment<V>[] newArray(int i) {
return new Segment[i];
}
@@ -1049,12 +1049,11 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
}
/*
- * final class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> { public K
- * next() { return super.nextEntry().key; } public K nextElement() { return super.nextEntry().key;
- * } }
+ * class KeyIterator extends HashIterator implements Iterator<K>, Enumeration<K> { public K next()
+ * { return super.nextEntry().key; } public K nextElement() { return super.nextEntry().key; } }
*
- * final class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> { public
- * V next() { return super.nextEntry().value; } public V nextElement() { return
+ * class ValueIterator extends HashIterator implements Iterator<V>, Enumeration<V> { public V
+ * next() { return super.nextEntry().value; } public V nextElement() { return
* super.nextEntry().value; } }
*/
@@ -1122,7 +1121,7 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
// * Custom Entry class used by EntryIterator.next(), that relays
// * setValue changes to the underlying map.
// */
- // final class WriteThroughEntry
+ // class WriteThroughEntry
// extends SimpleEntry<V>
// {
// WriteThroughEntry(int k, V v) {
@@ -1148,25 +1147,25 @@ public class ObjIdConcurrentMap<V> /* extends AbstractMap<K, V> */
// }
/*
- * final class EntryIterator extends HashIterator implements Iterator<Entry<V>> { public Entry<V>
- * next() { HashEntry<V> e = super.nextEntry(); return new WriteThroughEntry(e.key, e.value); } }
+ * class EntryIterator extends HashIterator implements Iterator<Entry<V>> { public Entry<V> next()
+ * { HashEntry<V> e = super.nextEntry(); return new WriteThroughEntry(e.key, e.value); } }
*
- * final class KeySet extends AbstractSet<K> { public Iterator<K> iterator() { return new
- * KeyIterator(); } public int size() { return ObjIdConcurrentMap.this.size(); } public boolean
- * isEmpty() { return ObjIdConcurrentMap.this.isEmpty(); } public boolean contains(Object o) {
- * return ObjIdConcurrentMap.this.containsKey(o); } public boolean remove(Object o) { return
+ * class KeySet extends AbstractSet<K> { public Iterator<K> iterator() { return new KeyIterator();
+ * } public int size() { return ObjIdConcurrentMap.this.size(); } public boolean isEmpty() {
+ * return ObjIdConcurrentMap.this.isEmpty(); } public boolean contains(Object o) { return
+ * ObjIdConcurrentMap.this.containsKey(o); } public boolean remove(Object o) { return
* ObjIdConcurrentMap.this.remove(o) != null; } public void clear() {
* ObjIdConcurrentMap.this.clear(); } }
*
- * final class Values extends AbstractCollection<V> { public Iterator<V> iterator() { return new
+ * class Values extends AbstractCollection<V> { public Iterator<V> iterator() { return new
* ValueIterator(); } public int size() { return ObjIdConcurrentMap.this.size(); } public boolean
* isEmpty() { return ObjIdConcurrentMap.this.isEmpty(); } public boolean contains(Object o) {
* return ObjIdConcurrentMap.this.containsValue(o); } public void clear() {
* ObjIdConcurrentMap.this.clear(); } }
*
- * final class EntrySet extends AbstractSet<Map.Entry<K,V>> { public Iterator<Map.Entry<K,V>>
- * iterator() { return new EntryIterator(); } public boolean contains(Object o) { if (!(o
- * instanceof Map.Entry)) return false; Map.Entry<?,?> e = (Map.Entry<?,?>)o; V v =
+ * class EntrySet extends AbstractSet<Map.Entry<K,V>> { public Iterator<Map.Entry<K,V>> iterator()
+ * { return new EntryIterator(); } public boolean contains(Object o) { if (!(o instanceof
+ * Map.Entry)) return false; Map.Entry<?,?> e = (Map.Entry<?,?>)o; V v =
* ObjIdConcurrentMap.this.get(e.getKey()); return v != null && v.equals(e.getValue()); } public
* boolean remove(Object o) { if (!(o instanceof Map.Entry)) return false; Map.Entry<?,?> e =
* (Map.Entry<?,?>)o; return ObjIdConcurrentMap.this.remove(e.getKey(), e.getValue()); } public
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
index bc6f23e..4e60c0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/PureJavaMode.java
@@ -20,7 +20,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
/**
* Used to determine if product should use pure java mode.
*/
-public final class PureJavaMode {
+public class PureJavaMode {
/**
* System property to set to true to force pure java mode
*/
@@ -67,11 +67,11 @@ public final class PureJavaMode {
osStatsAreAvailable = osName.startsWith("Linux") || !isPure;
}
- public final static boolean isPure() {
+ public static boolean isPure() {
return isPure;
}
- public final static boolean is64Bit() {
+ public static boolean is64Bit() {
return is64Bit;
}
@@ -79,7 +79,7 @@ public final class PureJavaMode {
* Linux has OsStats even in PureJava mode but other platforms require the native code to provide
* OS Statistics. return true if OSStatistics are available
*/
- public final static boolean osStatsAreAvailable() {
+ public static boolean osStatsAreAvailable() {
return osStatsAreAvailable;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java b/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
index 506cf03..66bd337 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SetUtils.java
@@ -24,7 +24,7 @@ import java.util.Set;
* @since GemFire 59poc
*
*/
-public final class SetUtils {
+public class SetUtils {
public static <T> boolean intersectsWith(final Set<? extends T> a, final Set<? extends T> b) {
if (a == b) {
return true;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
index bdb635e..ceae486 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
@@ -1267,7 +1267,7 @@ public class SystemAdmin {
*
*/
@SuppressWarnings("serial")
- private static final class CombinedResources extends ArrayList<ResourceInst> {
+ private static class CombinedResources extends ArrayList<ResourceInst> {
public CombinedResources(StatValue v) {
super(Arrays.asList(v.getResources()));
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 288d104..e058edb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 5.7
*/
-public final class Version implements Comparable<Version> {
+public class Version implements Comparable<Version> {
/** The name of this version */
private final transient String name;
@@ -318,7 +318,7 @@ public final class Version implements Comparable<Version> {
* {@link #readOrdinal(DataInput)} can deal with both compressed/uncompressed cases
* seemlessly
*/
- public final void writeOrdinal(DataOutput out, boolean compressed) throws IOException {
+ public void writeOrdinal(DataOutput out, boolean compressed) throws IOException {
writeOrdinal(out, this.ordinal, compressed);
}
@@ -326,7 +326,7 @@ public final class Version implements Comparable<Version> {
* Fixed number of bytes required for serializing this version when "compressed" flag is false in
* {@link #writeOrdinal(DataOutput, boolean)}.
*/
- public static final int uncompressedSize() {
+ public static int uncompressedSize() {
return 3;
}
@@ -334,7 +334,7 @@ public final class Version implements Comparable<Version> {
* Fixed number of bytes required for serializing this version when "compressed" flag is true in
* {@link #writeOrdinal(DataOutput, boolean)}.
*/
- public final int compressedSize() {
+ public int compressedSize() {
if (ordinal <= Byte.MAX_VALUE) {
return 1;
} else {
@@ -438,35 +438,35 @@ public final class Version implements Comparable<Version> {
return this.gemfireVersion != null ? this.gemfireVersion : this;
}
- public final String getMethodSuffix() {
+ public String getMethodSuffix() {
return this.methodSuffix;
}
- public final String getProductName() {
+ public String getProductName() {
return this.productName;
}
- public final String getName() {
+ public String getName() {
return this.name;
}
- public final short getMajorVersion() {
+ public short getMajorVersion() {
return this.majorVersion;
}
- public final short getMinorVersion() {
+ public short getMinorVersion() {
return this.minorVersion;
}
- public final short getRelease() {
+ public short getRelease() {
return this.release;
}
- public final short getPatch() {
+ public short getPatch() {
return this.patch;
}
- public final short ordinal() {
+ public short ordinal() {
return this.ordinal;
}
@@ -488,7 +488,7 @@ public final class Version implements Comparable<Version> {
* @return negative if this version is older, positive if this version is newer, 0 if this is the
* same version
*/
- public final int compareTo(short other) {
+ public int compareTo(short other) {
// first try to find the actual Version object
Version v = fromOrdinalNoThrow(other, false);
if (v == null) {
@@ -502,7 +502,7 @@ public final class Version implements Comparable<Version> {
* {@inheritDoc}
*/
@Override
- public final int compareTo(Version other) {
+ public int compareTo(Version other) {
if (other != null) {
// [bruce] old implementation used ordinals for comparison, but this requires
// ordinals to be in increasing order, which may not always be possible
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
index a8d4b88..93511b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataInputStream.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
*
* @since GemFire 7.1
*/
-public final class VersionedDataInputStream extends DataInputStream implements VersionedDataStream {
+public class VersionedDataInputStream extends DataInputStream implements VersionedDataStream {
private final Version version;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
index 2fb40b9..001fefe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedDataOutputStream.java
@@ -23,8 +23,7 @@ import java.io.OutputStream;
*
* @since GemFire 7.1
*/
-public final class VersionedDataOutputStream extends DataOutputStream
- implements VersionedDataStream {
+public class VersionedDataOutputStream extends DataOutputStream implements VersionedDataStream {
private final Version version;
@@ -43,7 +42,7 @@ public final class VersionedDataOutputStream extends DataOutputStream
* {@inheritDoc}
*/
@Override
- public final Version getVersion() {
+ public Version getVersion() {
return this.version;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
index 86e81c4..bd0b27f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectInput.java
@@ -24,7 +24,7 @@ import java.io.ObjectInput;
*
* @since GemFire 7.1
*/
-public final class VersionedObjectInput implements ObjectInput, VersionedDataStream {
+public class VersionedObjectInput implements ObjectInput, VersionedDataStream {
private final ObjectInput in;
private final Version version;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
index 83e6f73..09f3995 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/VersionedObjectOutput.java
@@ -24,7 +24,7 @@ import java.io.ObjectOutput;
*
* @since GemFire 7.1
*/
-public final class VersionedObjectOutput implements ObjectOutput, VersionedDataStream {
+public class VersionedObjectOutput implements ObjectOutput, VersionedDataStream {
private final ObjectOutput out;
private final Version version;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
index 5993d6b..6dd97e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerRequest.java
@@ -30,7 +30,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class AddHealthListenerRequest extends AdminRequest {
+public class AddHealthListenerRequest extends AdminRequest {
// instance variables
private GemFireHealthConfig cfg;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
index 8b960ab..8777303 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddHealthListenerResponse.java
@@ -30,7 +30,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class AddHealthListenerResponse extends AdminResponse {
+public class AddHealthListenerResponse extends AdminResponse {
// instance variables
int listenerId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
index 703ae6a..a911263 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
/**
* A message that is sent to a particular distribution manager to add a statistic listener.
*/
-public final class AddStatListenerRequest extends AdminRequest {
+public class AddStatListenerRequest extends AdminRequest {
// instance variables
private long resourceId;
private String statName;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
index b88772f..f5d708e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AddStatListenerResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.statistics.GemFireStatSampler;
* A message that is sent to a particular distribution manager to get its current
* <code>RemoteAddStatListener</code>.
*/
-public final class AddStatListenerResponse extends AdminResponse {
+public class AddStatListenerResponse extends AdminResponse {
// instance variables
int listenerId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
index 8452929..dd9b793 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* A message that is sent to a particular distribution manager to let it know that the sender is an
* administation console that just disconnected.
*/
-public final class AdminConsoleDisconnectMessage extends PooledDistributionMessage {
+public class AdminConsoleDisconnectMessage extends PooledDistributionMessage {
private static final Logger logger = LogService.getLogger();
// instance variables
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
index fa07560..d8c9665 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminConsoleMessage.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.logging.log4j.LogWriterLogger;
* A message that is sent to a particular distribution manager to let it know that the sender is an
* administation console that just connected.
*/
-public final class AdminConsoleMessage extends PooledDistributionMessage {
+public class AdminConsoleMessage extends PooledDistributionMessage {
// instance variables
int level;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
index 002d7d7..d201575 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AdminFailureResponse.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* A response to a failed request.
*/
-public final class AdminFailureResponse extends AdminResponse {
+public class AdminFailureResponse extends AdminResponse {
// instance variables
Exception cause;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
index c3a293f..25f1eb1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertLevelChangeMessage.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 3.5
*/
-public final class AlertLevelChangeMessage extends SerialDistributionMessage {
+public class AlertLevelChangeMessage extends SerialDistributionMessage {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
index 4f0e9ce..9f0e4bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AlertListenerMessage.java
@@ -30,8 +30,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* A message that is sent to a particular console distribution manager to notify it of an alert.
*/
-public final class AlertListenerMessage extends PooledDistributionMessage
- implements AdminMessageType {
+public class AlertListenerMessage extends PooledDistributionMessage implements AdminMessageType {
// instance variables
private int msgLevel;
private Date msgDate;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
index 7e08aa7..72f6903 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.*;
import org.apache.geode.*;
// import java.util.*;
-public final class AppCacheSnapshotMessage extends RegionAdminMessage {
+public class AppCacheSnapshotMessage extends RegionAdminMessage {
// private int numResults;
// private static Map consolesToSnapshots = new HashMap();
private int snapshotId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
index ae1d171..f65b09d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
*
* @since GemFire 4.0
*/
-public final class BridgeServerRequest extends AdminRequest {
+public class BridgeServerRequest extends AdminRequest {
/** Add a new bridge server */
static final int ADD_OPERATION = 10;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
index 4e915d6..ddc102d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/BridgeServerResponse.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.cache.InternalCache;
*
* @since GemFire 4.0
*/
-public final class BridgeServerResponse extends AdminResponse {
+public class BridgeServerResponse extends AdminResponse {
/** Information about the bridge server that was operated on */
private RemoteBridgeServer bridgeInfo;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
index b2c5c42..b541658 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigRequest.java
@@ -31,7 +31,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class CacheConfigRequest extends AdminRequest {
+public class CacheConfigRequest extends AdminRequest {
private byte attributeCode;
private int newValue;
private int cacheId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
index aedf67e..2e9c37c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheConfigResponse.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.InternalCache;
*
* @since GemFire 3.5
*/
-public final class CacheConfigResponse extends AdminResponse {
+public class CacheConfigResponse extends AdminResponse {
private RemoteCacheInfo info;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheDisplay.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheDisplay.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheDisplay.java
index fe596db..c842a19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheDisplay.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheDisplay.java
@@ -20,7 +20,7 @@ package org.apache.geode.internal.admin.remote;
import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.i18n.LocalizedStrings;
-public final class CacheDisplay {
+public class CacheDisplay {
public static Object getCachedObjectDisplay(Object obj, int inspectionType) {
switch (inspectionType) {
case GemFireVM.LIGHTWEIGHT_CACHE_VALUE:
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
index 9a2c2e8..21ad6c2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoRequest.java
@@ -29,7 +29,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class CacheInfoRequest extends AdminRequest {
+public class CacheInfoRequest extends AdminRequest {
/**
* Returns a <code>CacheInfoRequest</code>.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
index 5a5c36c..578252e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CacheInfoResponse.java
@@ -30,7 +30,7 @@ import org.apache.geode.internal.cache.InternalCache;
*
* @since GemFire 3.5
*/
-public final class CacheInfoResponse extends AdminResponse {
+public class CacheInfoResponse extends AdminResponse {
private RemoteCacheInfo info;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
index 2559ef2..d96d567 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
* A message that is sent to a particular distribution manager to get rid of a previously added
* statistic listener.
*/
-public final class CancelStatListenerRequest extends AdminRequest {
+public class CancelStatListenerRequest extends AdminRequest {
// instance variables
private int listenerId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
index 394e5b6..903f6fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancelStatListenerResponse.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.statistics.GemFireStatSampler;
* A message that is sent to a particular distribution manager to get its current
* <code>RemoteCancelStatListener</code>.
*/
-public final class CancelStatListenerResponse extends AdminResponse {
+public class CancelStatListenerResponse extends AdminResponse {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
index 462234b..5bab9f1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/CancellationMessage.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* A message that is sent to a particular distribution manager to cancel an admin request
*/
-public final class CancellationMessage extends PooledDistributionMessage {
+public class CancellationMessage extends PooledDistributionMessage {
// instance variables
private int msgToCancel;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
index 9dda2c9..ceb940f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyEntryMessage.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* A message that is sent to a particular distribution manager to let it know that the sender is an
* administation console that just connected.
*/
-public final class DestroyEntryMessage extends RegionAdminMessage {
+public class DestroyEntryMessage extends RegionAdminMessage {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
index 3e401ff..e6ed87c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/DestroyRegionMessage.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* A message that is sent to a particular distribution manager to let it know that the sender is an
* administation console that just connected.
*/
-public final class DestroyRegionMessage extends RegionAdminMessage {
+public class DestroyRegionMessage extends RegionAdminMessage {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
index 6272454..22e8378 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.*;
// import java.util.*;
-public final class FetchDistLockInfoRequest extends AdminRequest {
+public class FetchDistLockInfoRequest extends AdminRequest {
/**
* Returns a <code>FetchDistLockInfoRequest</code> to be sent to the specified recipient.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
index 6de15dd..ba6a0c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse.java
@@ -26,7 +26,7 @@ import java.io.*;
import java.util.*;
import org.apache.geode.distributed.internal.membership.*;
-public final class FetchDistLockInfoResponse extends AdminResponse {
+public class FetchDistLockInfoResponse extends AdminResponse {
// instance variables
DLockInfo[] lockInfos;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
index 09369ba..b491632 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class FetchHealthDiagnosisRequest extends AdminRequest {
+public class FetchHealthDiagnosisRequest extends AdminRequest {
// instance variables
private int id = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
index 0f44767..55bdc64 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse.java
@@ -30,7 +30,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class FetchHealthDiagnosisResponse extends AdminResponse {
+public class FetchHealthDiagnosisResponse extends AdminResponse {
// instance variables
String[] diagnosis;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
index 4868158..74e5fec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostRequest.java
@@ -24,7 +24,7 @@ import java.io.*;
/**
* A message that is sent to a particular distribution manager to get its current information
*/
-public final class FetchHostRequest extends AdminRequest {
+public class FetchHostRequest extends AdminRequest {
/**
* Returns a <code>FetchHostRequest</code> to be sent to the specified recipient.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
index 9a771f8..9ca66ca 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java
@@ -41,7 +41,7 @@ import java.net.UnknownHostException;
* A message that is sent to a particular distribution manager to get its current
* {@link org.apache.geode.internal.Config}
*/
-public final class FetchHostResponse extends AdminResponse {
+public class FetchHostResponse extends AdminResponse {
private static final Logger logger = LogService.getLogger();
// instance variables
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
index efddcd2..e4cf695 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.*;
// import java.util.*;
-public final class FetchResourceAttributesRequest extends AdminRequest {
+public class FetchResourceAttributesRequest extends AdminRequest {
// instance variables
private long resourceUniqueId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
index f6c7c8d..7d0fbb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse.java
@@ -21,7 +21,7 @@ import org.apache.geode.*;
import java.io.*;
import org.apache.geode.distributed.internal.membership.*;
-public final class FetchResourceAttributesResponse extends AdminResponse {
+public class FetchResourceAttributesResponse extends AdminResponse {
// instance variables
private RemoteStat[] stats;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
index 94677b8..36994ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.distributed.internal.*;
import java.io.*;
// import java.util.*;
-public final class FetchStatsRequest extends AdminRequest {
+public class FetchStatsRequest extends AdminRequest {
private String statisticsTypeName;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
index 08c96d6..ab122c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchStatsResponse.java
@@ -32,7 +32,7 @@ import org.apache.geode.distributed.internal.membership.*;
* Provides a response of remote statistic resources for a <code>FetchStatsRequest</code>
*
*/
-public final class FetchStatsResponse extends AdminResponse {
+public class FetchStatsResponse extends AdminResponse {
// instance variables
private RemoteStatResource[] stats;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
index 9b8a98f..a06356a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgRequest.java
@@ -25,7 +25,7 @@ import java.io.*;
* A message that is sent to a particular distribution manager to get its current
* {@link org.apache.geode.internal.Config}.
*/
-public final class FetchSysCfgRequest extends AdminRequest {
+public class FetchSysCfgRequest extends AdminRequest {
/**
* Returns a <code>FetchSysCfgRequest</code> to be sent to the specified recipient.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
index f9f9449..b50a3b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchSysCfgResponse.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* A message that is sent to a particular distribution manager to get its current {@link Config}.
*/
-public final class FetchSysCfgResponse extends AdminResponse {
+public class FetchSysCfgResponse extends AdminResponse {
// instance variables
Config sc;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
index a5bfb64..fddafe5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage.java
@@ -26,7 +26,7 @@ import java.io.*;
* A message to cause a remote application to release any snapshot info it was holding on behalf of
* a console.
*/
-public final class FlushAppCacheSnapshotMessage extends PooledDistributionMessage {
+public class FlushAppCacheSnapshotMessage extends PooledDistributionMessage {
public static FlushAppCacheSnapshotMessage create() {
FlushAppCacheSnapshotMessage m = new FlushAppCacheSnapshotMessage();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
index 653cf6a..b3b309a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/HealthListenerMessage.java
@@ -31,8 +31,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class HealthListenerMessage extends PooledDistributionMessage
- implements AdminMessageType {
+public class HealthListenerMessage extends PooledDistributionMessage implements AdminMessageType {
// instance variables
private int listenerId;
private GemFireHealth.Health status;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
index abcabb3..1ba0088 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoRequest.java
@@ -26,7 +26,7 @@ import java.io.*;
/**
* A message that is sent to a particular distribution manager to get its current license info.
*/
-public final class LicenseInfoRequest extends AdminRequest {
+public class LicenseInfoRequest extends AdminRequest {
/**
* Returns a <code>LicenseInfoRequest</code>.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
index 73c847a..41bfa9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/LicenseInfoResponse.java
@@ -30,7 +30,7 @@ import java.util.Properties;
/**
* A message that is sent in response to a {@link LicenseInfoRequest}.
*/
-public final class LicenseInfoResponse extends AdminResponse {
+public class LicenseInfoResponse extends AdminResponse {
private static final Logger logger = LogService.getLogger();
// instance variables
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
index 11c5336..86167a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
* A message that is sent to a particular app vm to request the value, stats, and attributes of a
* given region entry.
*/
-public final class ObjectDetailsRequest extends RegionAdminRequest implements Cancellable {
+public class ObjectDetailsRequest extends RegionAdminRequest implements Cancellable {
// instance variables
private Object objName;
private int inspectionType;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
index 6c54a42..af056e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectDetailsResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link ObjectDetailsRequest}.
*/
-public final class ObjectDetailsResponse extends AdminResponse implements Cancellable {
+public class ObjectDetailsResponse extends AdminResponse implements Cancellable {
// instance variables
private Object objectValue;
private Object userAttribute;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
index aaabec6..6424e19 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
* A message that is sent to a particular app vm to request all the subregions of a given parent
* region.
*/
-public final class ObjectNamesRequest extends RegionAdminRequest implements Cancellable {
+public class ObjectNamesRequest extends RegionAdminRequest implements Cancellable {
// instance variables
private transient boolean cancelled;
private transient ObjectNamesResponse resp;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
index 5a0d076..e6832c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ObjectNamesResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link ObjectNamesResponse}.
*/
-public final class ObjectNamesResponse extends AdminResponse implements Cancellable {
+public class ObjectNamesResponse extends AdminResponse implements Cancellable {
// instance variables
private HashSet objectNames;
private transient boolean cancelled;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
index ce0af24..4592161 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesRequest.java
@@ -26,7 +26,7 @@ import java.io.*;
/**
* A message that is sent to a particular app vm to request the region statistics of a given region.
*/
-public final class RegionAttributesRequest extends RegionAdminRequest {
+public class RegionAttributesRequest extends RegionAdminRequest {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
index 99d0ee1..4ef4cd2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionAttributesResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link RegionAttributesResponse}.
*/
-public final class RegionAttributesResponse extends AdminResponse {
+public class RegionAttributesResponse extends AdminResponse {
// instance variables
private RemoteRegionAttributes attributes;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
index 5850767..c63a8ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class RegionRequest extends AdminRequest {
+public class RegionRequest extends AdminRequest {
/** Request to get a region */
static final int GET_REGION = 10;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
index a7971a7..b3b678e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionResponse.java
@@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class RegionResponse extends AdminResponse {
+public class RegionResponse extends AdminResponse {
// instance variables
/** The name of the region returned in the response. */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
index 96b177b..453e076 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
* A message that is sent to a particular app vm to request all the subregions of a given parent
* region.
*/
-public final class RegionSizeRequest extends RegionAdminRequest implements Cancellable {
+public class RegionSizeRequest extends RegionAdminRequest implements Cancellable {
private transient boolean cancelled;
private transient RegionSizeResponse resp;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
index c6c1ab3..d0c28b3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionSizeResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link RegionSizeRequest}.
*/
-public final class RegionSizeResponse extends AdminResponse implements Cancellable {
+public class RegionSizeResponse extends AdminResponse implements Cancellable {
// instance variables
private int entryCount;
private int subregionCount;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
index c4d1791..c95f9db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsRequest.java
@@ -26,7 +26,7 @@ import java.io.*;
/**
* A message that is sent to a particular app vm to request the region statistics of a given region.
*/
-public final class RegionStatisticsRequest extends RegionAdminRequest {
+public class RegionStatisticsRequest extends RegionAdminRequest {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
index 8480842..e2c919d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RegionStatisticsResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link RegionStatisticsResponse}.
*/
-public final class RegionStatisticsResponse extends AdminResponse {
+public class RegionStatisticsResponse extends AdminResponse {
// instance variables
RemoteCacheStatistics regionStatistics;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
index 1679705..cfbdd5b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteApplicationVM.java
@@ -22,7 +22,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Represents an application VM (member of the distributed system).
*/
-public final class RemoteApplicationVM extends RemoteGemFireVM implements ApplicationVM {
+public class RemoteApplicationVM extends RemoteGemFireVM implements ApplicationVM {
// constructors
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
index e23f2d2..64b5925 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
@@ -49,7 +49,7 @@ import java.util.concurrent.*;
public
// Note that since we export the instances in a public list,
// I'm not permitting subclasses
-final class RemoteGfManagerAgent implements GfManagerAgent {
+class RemoteGfManagerAgent implements GfManagerAgent {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
index 7a6ad09..fdcb224 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteRegionAttributes.java
@@ -498,11 +498,11 @@ public class RemoteRegionAttributes implements RegionAttributes, DataSerializabl
}
@Override
- public final String toString() {
+ public String toString() {
return desc;
}
- public final void close() {}
+ public void close() {}
}
private static class RemoteCacheListener extends RemoteCacheCallback implements CacheListener {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
index 08d94e6..570b6fa 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest.java
@@ -29,7 +29,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class RemoveHealthListenerRequest extends AdminRequest {
+public class RemoveHealthListenerRequest extends AdminRequest {
// instance variables
private int id;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
index f8a7b80..894a2a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse.java
@@ -29,7 +29,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class RemoveHealthListenerResponse extends AdminResponse {
+public class RemoveHealthListenerResponse extends AdminResponse {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
index 6752e97..e381f6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusRequest.java
@@ -29,7 +29,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class ResetHealthStatusRequest extends AdminRequest {
+public class ResetHealthStatusRequest extends AdminRequest {
// instance variables
private int id;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
index b18ac07..66ca180 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/ResetHealthStatusResponse.java
@@ -29,7 +29,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class ResetHealthStatusResponse extends AdminResponse {
+public class ResetHealthStatusResponse extends AdminResponse {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
index c927e13..2651f53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
* A message that is sent to a particular application to get its root region(s). All it really needs
* to find out is if the app has created a cache.
*/
-public final class RootRegionRequest extends AdminRequest {
+public class RootRegionRequest extends AdminRequest {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
index 78ac174..3dad8f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RootRegionResponse.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.InternalCache;
/**
* Responds to {@link RootRegionResponse}.
*/
-public final class RootRegionResponse extends AdminResponse {
+public class RootRegionResponse extends AdminResponse {
private String[] regions;
private String[] userAttrs;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
index de2fba9..9b2aa02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SnapshotResultMessage.java
@@ -24,8 +24,7 @@ import org.apache.geode.cache.*;
import java.io.*;
// import java.util.*;
-public final class SnapshotResultMessage extends PooledDistributionMessage
- implements AdminMessageType {
+public class SnapshotResultMessage extends PooledDistributionMessage implements AdminMessageType {
private CacheSnapshot results;
private int snapshotId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
index 28ab9cf..e4142b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StatListenerMessage.java
@@ -27,8 +27,7 @@ import java.io.*;
* A message that is sent to a particular console distribution manager when changes have been
* detected that will be of interest to registered stat listeners.
*/
-public final class StatListenerMessage extends PooledDistributionMessage
- implements AdminMessageType {
+public class StatListenerMessage extends PooledDistributionMessage implements AdminMessageType {
// instance variables
private long timestamp;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
index 5049882..340794f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
* A message that is sent to a particular distribution manager to modify its current
* {@link org.apache.geode.internal.Config}.
*/
-public final class StoreSysCfgRequest extends AdminRequest {
+public class StoreSysCfgRequest extends AdminRequest {
// instance variables
Config sc;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
index b4d6dfe..c1d0048 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/StoreSysCfgResponse.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.membership.*;
* A message that is sent to a particular distribution manager to modify its current
* {@link org.apache.geode.internal.Config}.
*/
-public final class StoreSysCfgResponse extends AdminResponse {
+public class StoreSysCfgResponse extends AdminResponse {
// instance variables
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
index 0fc05fc..e9216b5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
* A message that is sent to a particular app vm to request all the subregions of a given parent
* region.
*/
-public final class SubRegionRequest extends RegionAdminRequest {
+public class SubRegionRequest extends RegionAdminRequest {
// instance variables
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
index 01b98df..267648f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/SubRegionResponse.java
@@ -28,7 +28,7 @@ import org.apache.geode.distributed.internal.membership.*;
/**
* Responds to {@link SubRegionResponse}.
*/
-public final class SubRegionResponse extends AdminResponse {
+public class SubRegionResponse extends AdminResponse {
// instance variables
String[] subRegionNames;
String[] userAttributes;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
index 6665ad9..8ca369d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogRequest.java
@@ -23,7 +23,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.*;
// import java.util.*;
-public final class TailLogRequest extends AdminRequest {
+public class TailLogRequest extends AdminRequest {
public static TailLogRequest create() {
TailLogRequest m = new TailLogRequest();
return m;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
index c5eff6f..5d94bc7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/TailLogResponse.java
@@ -33,7 +33,7 @@ import java.io.*;
// import org.apache.geode.distributed.DistributedSystem;
// import java.util.*;
-public final class TailLogResponse extends AdminResponse {
+public class TailLogResponse extends AdminResponse {
private static final Logger logger = LogService.getLogger();
private String tail;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
index 87f3824..1079025 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
*
* @since GemFire 3.5
*/
-public final class VersionInfoRequest extends AdminRequest {
+public class VersionInfoRequest extends AdminRequest {
/**
* Returns a <code>VersionInfoRequest</code>.
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
index 1887fce..a472af8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/VersionInfoResponse.java
@@ -29,7 +29,7 @@ import org.apache.geode.distributed.internal.membership.*;
*
* @since GemFire 3.5
*/
-public final class VersionInfoResponse extends AdminResponse {
+public class VersionInfoResponse extends AdminResponse {
// instance variables
private String verInfo;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
index 0f752b3..5b7c750 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl.java
@@ -48,7 +48,7 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
this._def = definition;
}
- public final int getId() {
+ public int getId() {
return _def.getId();
}
@@ -74,11 +74,11 @@ public abstract class BaseDecoratorImpl implements StatAlertDefinition {
_def.setName(name);
}
- public final StatisticInfo[] getStatisticInfo() {
+ public StatisticInfo[] getStatisticInfo() {
return _def.getStatisticInfo();
}
- public final void setStatisticInfo(StatisticInfo[] info) {
+ public void setStatisticInfo(StatisticInfo[] info) {
_def.setStatisticInfo(info);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
index 0a3fcb9..54a0d06 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
* all the statistic Threshold is valid for value evaluated by function
*
*/
-public final class FunctionDecoratorImpl extends BaseDecoratorImpl {
+public class FunctionDecoratorImpl extends BaseDecoratorImpl {
private static final long serialVersionUID = -4857857489413081553L;
protected short functorId = -1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
index fa96cae..b1a8b0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/FunctionHelper.java
@@ -132,7 +132,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number SUM(Number[] vals) {
+ public static Number SUM(Number[] vals) {
try {
double sum = 0.0;
for (int i = 0; i < vals.length; i++) {
@@ -160,7 +160,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number AVG(Number[] vals) {
+ public static Number AVG(Number[] vals) {
try {
return Double.valueOf(SUM(vals).doubleValue() / vals.length);
} catch (VirtualMachineError err) {
@@ -184,7 +184,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number MIN(Number[] vals) {
+ public static Number MIN(Number[] vals) {
try {
Collection col = Arrays.asList(vals);
Number min = (Number) Collections.max(col);
@@ -211,7 +211,7 @@ public class FunctionHelper {
*
* @param vals Array of number
*/
- public static final Number MAX(Number[] vals) {
+ public static Number MAX(Number[] vals) {
try {
Collection col = Arrays.asList(vals);
Number max = (Number) Collections.max(col);
[69/69] [abbrv] geode git commit: apply spotless.
Posted by ud...@apache.org.
apply spotless.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/2ccedd06
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/2ccedd06
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/2ccedd06
Branch: refs/heads/feature/GEODE-2580
Commit: 2ccedd0628c4d3408d661672f4762326f8592b49
Parents: 9973c49
Author: Galen OSullivan <go...@pivotal.io>
Authored: Thu May 18 17:26:14 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon May 22 11:27:03 2017 -0700
----------------------------------------------------------------------
.../client/ProtobufProtocolMessageHandler.java | 14 ++++++++------
.../apache/geode/protocol/client/MessageUtils.java | 12 +++++++-----
.../client/ProtobufProtocolIntegrationTest.java | 15 ++++++---------
.../tier/sockets/ClientProtocolMessageHandler.java | 2 +-
.../cache/tier/sockets/ServerConnection.java | 2 +-
5 files changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
index 10ad7e9..85de51d 100644
--- a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
+++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
@@ -49,7 +49,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
@Override
public void receiveMessage(InputStream inputStream, OutputStream outputStream,
- Deserializer deserializer, Serializer serializer, Cache cache) throws IOException {
+ Deserializer deserializer, Serializer serializer, Cache cache) throws IOException {
final Message message = Message.parseDelimitedFrom(inputStream);
// can be null at EOF, see Parser.parseDelimitedFrom(java.io.InputStream)
if (message == null) {
@@ -73,7 +73,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
// TODO
}
if (responseMessage != null) {
- responseMessage.writeDelimitedTo(outputStream);
+ responseMessage.writeDelimitedTo(outputStream);
}
}
@@ -100,7 +100,8 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
.build();
}
- private Message doGetRequest(GetRequest request, Deserializer deserializer, Serializer serializer, Cache cache) {
+ private Message doGetRequest(GetRequest request, Deserializer deserializer, Serializer serializer,
+ Cache cache) {
String regionName = request.getRegionName();
BasicTypes.Key key = request.getKey();
byte[] keyBytes = key.getKey().toByteArray();
@@ -118,9 +119,10 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
private Message getResponseWithValue(byte[] value) {
return Message.newBuilder()
- .setResponse(Response.newBuilder().setGetResponse(RegionAPI.GetResponse.newBuilder()
- .setResult(BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(value)))))
- .build();
+ .setResponse(Response.newBuilder()
+ .setGetResponse(RegionAPI.GetResponse.newBuilder()
+ .setResult(BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(value)))))
+ .build();
}
public ProtobufProtocolMessageHandler() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
index 4991467..7cb5ffa 100644
--- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
@@ -85,16 +85,18 @@ public class MessageUtils {
public static ClientProtocol.Message makeGetMessageFor(String region, String key) {
Random random = new Random();
ClientProtocol.MessageHeader.Builder messageHeader =
- ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
+ ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
BasicTypes.Key.Builder keyBuilder =
- BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key));
+ BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key));
- RegionAPI.GetRequest.Builder getRequest = RegionAPI.GetRequest.newBuilder().setRegionName(region).setKey(keyBuilder);
- ClientProtocol.Request.Builder request = ClientProtocol.Request.newBuilder().setGetRequest(getRequest);
+ RegionAPI.GetRequest.Builder getRequest =
+ RegionAPI.GetRequest.newBuilder().setRegionName(region).setKey(keyBuilder);
+ ClientProtocol.Request.Builder request =
+ ClientProtocol.Request.newBuilder().setGetRequest(getRequest);
return ClientProtocol.Message.newBuilder().setMessageHeader(messageHeader).setRequest(request)
- .build();
+ .build();
}
private static byte[] createByteArrayOfSize(int msgSize) {
http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
index b3864a2..1a9b62e 100644
--- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
@@ -52,8 +52,7 @@ public class ProtobufProtocolIntegrationTest {
client.printResponse(response);
assertEquals(RESPONSE, response.getMessageTypeCase());
- assertEquals(PUTRESPONSE,
- response.getResponse().getResponseAPICase());
+ assertEquals(PUTRESPONSE, response.getResponse().getResponseAPICase());
assertTrue(response.getResponse().getPutResponse().getSuccess());
assertEquals(1, region.size());
@@ -65,7 +64,7 @@ public class ProtobufProtocolIntegrationTest {
@Test
public void testRoundTripEmptyGetRequest() throws IOException {
try (Cache cache = createCacheOnPort(40404);
- NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
+ NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
final String testRegion = "testRegion";
final String testKey = "testKey";
Region<Object, Object> region = cache.createRegionFactory().create("testRegion");
@@ -74,8 +73,7 @@ public class ProtobufProtocolIntegrationTest {
ClientProtocol.Message response = client.blockingSendMessage(message);
assertEquals(RESPONSE, response.getMessageTypeCase());
- assertEquals(GETRESPONSE,
- response.getResponse().getResponseAPICase());
+ assertEquals(GETRESPONSE, response.getResponse().getResponseAPICase());
BasicTypes.Value value = response.getResponse().getGetResponse().getResult();
assertTrue(value.getValue().isEmpty());
@@ -85,7 +83,7 @@ public class ProtobufProtocolIntegrationTest {
@Test
public void testRoundTripNonEmptyGetRequest() throws IOException {
try (Cache cache = createCacheOnPort(40404);
- NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
+ NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
final String testRegion = "testRegion";
final String testKey = "testKey";
final String testValue = "testValue";
@@ -93,7 +91,7 @@ public class ProtobufProtocolIntegrationTest {
ClientProtocol.Message putMessage =
- MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
+ MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
ClientProtocol.Message putResponse = client.blockingSendMessage(putMessage);
client.printResponse(putResponse);
@@ -101,8 +99,7 @@ public class ProtobufProtocolIntegrationTest {
ClientProtocol.Message getResponse = client.blockingSendMessage(getMessage);
assertEquals(RESPONSE, getResponse.getMessageTypeCase());
- assertEquals(GETRESPONSE,
- getResponse.getResponse().getResponseAPICase());
+ assertEquals(GETRESPONSE, getResponse.getResponse().getResponseAPICase());
BasicTypes.Value value = getResponse.getResponse().getGetResponse().getResult();
assertEquals(value.getValue().toStringUtf8(), testValue);
http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
index e7e75bf..3e37c4a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
@@ -25,5 +25,5 @@ import java.io.OutputStream;
public interface ClientProtocolMessageHandler {
void receiveMessage(InputStream inputStream, OutputStream outputStream, Deserializer deserializer,
- Serializer serializer, Cache cache) throws IOException;
+ Serializer serializer, Cache cache) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/2ccedd06/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 58f1709..a61c86c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -958,7 +958,7 @@ public class ServerConnection implements Runnable {
// TODO serialization types?
newClientProtocol.receiveMessage(inputStream, outputStream,
SerializationType.STRING.deserializer, SerializationType.STRING.serializer,
- this.getCache());
+ this.getCache());
} catch (IOException e) {
// TODO?
}
[51/69] [abbrv] geode git commit: GEODE-2662: Gfsh displays field
value on wrong line when receiving objects with missing fields
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
index 8620cff..e2164a3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
@@ -14,23 +14,7 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.subject.Subject;
-import org.json.JSONArray;
-
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -80,6 +64,19 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.JsonUtil;
import org.apache.geode.pdx.PdxInstance;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.subject.Subject;
+import org.json.JSONArray;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @since GemFire 7.0
@@ -138,29 +135,28 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
System.getProperty("memberName"));
}
DataCommandResult result = null;
- if (request.isGet())
+ if (request.isGet()) {
result = get(request);
- else if (request.isLocateEntry())
+ } else if (request.isLocateEntry()) {
result = locateEntry(request);
- else if (request.isPut())
+ } else if (request.isPut()) {
result = put(request);
- else if (request.isRemove())
+ } else if (request.isRemove()) {
result = remove(request);
- else if (request.isSelect())
+ } else if (request.isSelect()) {
result = select(request);
+ }
if (logger.isDebugEnabled()) {
logger.debug("Result is {}", result);
}
functionContext.getResultSender().lastResult(result);
- } catch (CacheClosedException e) {
- e.printStackTrace();
- functionContext.getResultSender().sendException(e);
} catch (Exception e) {
- e.printStackTrace();
+ logger.info("Exception occurred:", e);
functionContext.getResultSender().sendException(e);
}
}
+
private InternalCache getCache() {
return (InternalCache) CacheFactory.getAnyInstance();
}
@@ -223,132 +219,131 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
@SuppressWarnings("rawtypes")
private DataCommandResult select(Object principal, String queryString) {
+
InternalCache cache = getCache();
AtomicInteger nestedObjectCount = new AtomicInteger(0);
- if (queryString != null && !queryString.isEmpty()) {
- QueryService qs = cache.getQueryService();
-
- // TODO : Find out if is this optimised use. Can you have something equivalent of parsed
- // queries with names
- // where name can be retrieved to avoid parsing every-time
- Query query = qs.newQuery(queryString);
- DefaultQuery tracedQuery = (DefaultQuery) query;
- WrappedIndexTrackingQueryObserver queryObserver = null;
- String queryVerboseMsg = null;
- long startTime = -1;
+ if (StringUtils.isEmpty(queryString)) {
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ CliStrings.QUERY__MSG__QUERY_EMPTY, false);
+ }
+
+ QueryService qs = cache.getQueryService();
+
+ // TODO : Find out if is this optimised use. Can you have something equivalent of parsed
+ // queries with names where name can be retrieved to avoid parsing every-time
+ Query query = qs.newQuery(queryString);
+ DefaultQuery tracedQuery = (DefaultQuery) query;
+ WrappedIndexTrackingQueryObserver queryObserver = null;
+ String queryVerboseMsg = null;
+ long startTime = -1;
+ if (tracedQuery.isTraced()) {
+ startTime = NanoTimer.getTime();
+ queryObserver = new WrappedIndexTrackingQueryObserver();
+ QueryObserverHolder.setInstance(queryObserver);
+ }
+ List<SelectResultRow> list = new ArrayList<>();
+
+ try {
+ Object results = query.execute();
if (tracedQuery.isTraced()) {
- startTime = NanoTimer.getTime();
- queryObserver = new WrappedIndexTrackingQueryObserver();
- QueryObserverHolder.setInstance(queryObserver);
+ queryVerboseMsg = getLogMessage(queryObserver, startTime, queryString);
+ queryObserver.reset2();
}
- List<SelectResultRow> list = new ArrayList<SelectResultRow>();
+ if (results instanceof SelectResults) {
+ select_SelectResults((SelectResults) results, principal, list, nestedObjectCount);
+ } else {
+ select_NonSelectResults(results, list);
+ }
+ return DataCommandResult.createSelectResult(queryString, list, queryVerboseMsg, null, null,
+ true);
+
+ } catch (FunctionDomainException | GfJsonException | QueryInvocationTargetException
+ | NameResolutionException | TypeMismatchException e) {
+ logger.warn(e.getMessage(), e);
+ return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
+ e.getMessage(), false);
+ } finally {
+ if (queryObserver != null) {
+ QueryObserverHolder.reset();
+ }
+ }
+ }
+ private void select_NonSelectResults(Object results, List<SelectResultRow> list) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("BeanResults : Bean Results class is {}", results.getClass());
+ }
+ String str = toJson(results);
+ GfJsonObject jsonBean;
+ try {
+ jsonBean = new GfJsonObject(str);
+ } catch (GfJsonException e) {
+ logger.info("Exception occurred:", e);
+ jsonBean = new GfJsonObject();
try {
- Object results = query.execute();
- if (tracedQuery.isTraced()) {
- queryVerboseMsg = getLogMessage(queryObserver, startTime, queryString);
- queryObserver.reset2();
+ jsonBean.put("msg", e.getMessage());
+ } catch (GfJsonException e1) {
+ logger.warn("Ignored GfJsonException:", e1);
+ }
+ }
+ if (logger.isDebugEnabled()) {
+ logger.debug("BeanResults : Adding bean json string : {}", jsonBean);
+ }
+ list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_BEAN, jsonBean.toString()));
+ }
+
+ private void select_SelectResults(SelectResults selectResults, Object principal,
+ List<SelectResultRow> list, AtomicInteger nestedObjectCount) throws GfJsonException {
+ for (Object object : selectResults) {
+ // Post processing
+ object = securityService.postProcess(principal, null, null, object, false);
+
+ if (object instanceof Struct) {
+ StructImpl impl = (StructImpl) object;
+ GfJsonObject jsonStruct = getJSONForStruct(impl, nestedObjectCount);
+ if (logger.isDebugEnabled()) {
+ logger.debug("SelectResults : Adding select json string : {}", jsonStruct);
}
- if (results instanceof SelectResults) {
- SelectResults selectResults = (SelectResults) results;
- for (Iterator iter = selectResults.iterator(); iter.hasNext();) {
- Object object = iter.next();
- // Post processing
- object = this.securityService.postProcess(principal, null, null, object, false);
-
- if (object instanceof Struct) {
- StructImpl impl = (StructImpl) object;
- GfJsonObject jsonStruct = getJSONForStruct(impl, nestedObjectCount);
- if (logger.isDebugEnabled())
- logger.debug("SelectResults : Adding select json string : {}", jsonStruct);
- list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_STRUCT_RESULT,
- jsonStruct.toString()));
- } else {
- if (JsonUtil.isPrimitiveOrWrapper(object.getClass())) {
- if (logger.isDebugEnabled())
- logger.debug("SelectResults : Adding select primitive : {}", object);
- list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_PRIMITIVE, object));
- } else {
- if (logger.isDebugEnabled())
- logger.debug("SelectResults : Bean Results class is {}", object.getClass());
- String str = toJson(object);
- GfJsonObject jsonBean;
- try {
- jsonBean = new GfJsonObject(str);
- } catch (GfJsonException e) {
- logger.fatal(e.getMessage(), e);
- jsonBean = new GfJsonObject();
- try {
- jsonBean.put("msg", e.getMessage());
- } catch (GfJsonException e1) {
- }
- }
- if (logger.isDebugEnabled())
- logger.debug("SelectResults : Adding bean json string : {}", jsonBean);
- list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_BEAN, jsonBean.toString()));
- }
- }
- }
- } else {
- if (logger.isDebugEnabled())
- logger.debug("BeanResults : Bean Results class is {}", results.getClass());
- String str = toJson(results);
- GfJsonObject jsonBean;
+ list.add(
+ new SelectResultRow(DataCommandResult.ROW_TYPE_STRUCT_RESULT, jsonStruct.toString()));
+ } else if (JsonUtil.isPrimitiveOrWrapper(object.getClass())) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("SelectResults : Adding select primitive : {}", object);
+ }
+ list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_PRIMITIVE, object));
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.debug("SelectResults : Bean Results class is {}", object.getClass());
+ }
+ String str = toJson(object);
+ GfJsonObject jsonBean;
+ try {
+ jsonBean = new GfJsonObject(str);
+ } catch (GfJsonException e) {
+ logger.error(e.getMessage(), e);
+ jsonBean = new GfJsonObject();
try {
- jsonBean = new GfJsonObject(str);
- } catch (GfJsonException e) {
- e.printStackTrace();
- jsonBean = new GfJsonObject();
- try {
- jsonBean.put("msg", e.getMessage());
- } catch (GfJsonException e1) {
- }
+ jsonBean.put("msg", e.getMessage());
+ } catch (GfJsonException e1) {
+ logger.warn("Ignored GfJsonException:", e1);
}
- if (logger.isDebugEnabled())
- logger.debug("BeanResults : Adding bean json string : {}", jsonBean);
- list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_BEAN, jsonBean.toString()));
}
- return DataCommandResult.createSelectResult(queryString, list, queryVerboseMsg, null, null,
- true);
-
- } catch (FunctionDomainException e) {
- logger.warn(e.getMessage(), e);
- return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
- e.getMessage(), false);
- } catch (TypeMismatchException e) {
- logger.warn(e.getMessage(), e);
- return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
- e.getMessage(), false);
- } catch (NameResolutionException e) {
- logger.warn(e.getMessage(), e);
- return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
- e.getMessage(), false);
- } catch (QueryInvocationTargetException e) {
- logger.warn(e.getMessage(), e);
- return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
- e.getMessage(), false);
- } catch (GfJsonException e) {
- logger.warn(e.getMessage(), e);
- return DataCommandResult.createSelectResult(queryString, null, queryVerboseMsg, e,
- e.getMessage(), false);
- } finally {
- if (queryObserver != null) {
- QueryObserverHolder.reset();
+ if (logger.isDebugEnabled()) {
+ logger.debug("SelectResults : Adding bean json string : {}", jsonBean);
}
+ list.add(new SelectResultRow(DataCommandResult.ROW_TYPE_BEAN, jsonBean.toString()));
}
- } else {
- return DataCommandResult.createSelectInfoResult(null, null, -1, null,
- CliStrings.QUERY__MSG__QUERY_EMPTY, false);
}
}
private String toJson(Object object) {
if (object instanceof Undefined) {
return "{\"Value\":\"UNDEFINED\"}";
- } else if (object instanceof PdxInstance)
+ } else if (object instanceof PdxInstance) {
return pdxToJson((PdxInstance) object);
- else
+ } else {
return JsonUtil.objectToJsonNestedChkCDep(object, NESTED_JSON_LENGTH);
+ }
}
private GfJsonObject getJSONForStruct(StructImpl impl, AtomicInteger ai) throws GfJsonException {
@@ -376,14 +371,13 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
InternalCache cache = getCache();
- if (regionName == null || regionName.isEmpty()) {
+ if (StringUtils.isEmpty(regionName)) {
return DataCommandResult.createRemoveResult(key, null, null,
CliStrings.REMOVE__MSG__REGIONNAME_EMPTY, false);
}
- boolean allKeysFlag = (removeAllKeys == null || removeAllKeys.isEmpty());
- if (allKeysFlag && (key == null)) {
- return DataCommandResult.createRemoveResult(key, null, null,
+ if (StringUtils.isEmpty(removeAllKeys) && (key == null)) {
+ return DataCommandResult.createRemoveResult(null, null, null,
CliStrings.REMOVE__MSG__KEY_EMPTY, false);
}
@@ -393,7 +387,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
CliStrings.format(CliStrings.REMOVE__MSG__REGION_NOT_FOUND, regionName), false);
} else {
if (removeAllKeys == null) {
- Object keyObject = null;
+ Object keyObject;
try {
keyObject = getClassObject(key, keyClass);
} catch (ClassNotFoundException e) {
@@ -406,14 +400,16 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
if (region.containsKey(keyObject)) {
Object value = region.remove(keyObject);
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Removed key {} successfully", key);
+ }
// return DataCommandResult.createRemoveResult(key, value, null, null);
Object array[] = getJSONForNonPrimitiveObject(value);
DataCommandResult result =
DataCommandResult.createRemoveResult(key, array[1], null, null, true);
- if (array[0] != null)
+ if (array[0] != null) {
result.setValueClass((String) array[0]);
+ }
return result;
} else {
return DataCommandResult.createRemoveInfoResult(key, null, null,
@@ -423,8 +419,9 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
DataPolicy policy = region.getAttributes().getDataPolicy();
if (!policy.withPartitioning()) {
region.clear();
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Cleared all keys in the region - {}", regionName);
+ }
return DataCommandResult.createRemoveInfoResult(key, null, null,
CliStrings.format(CliStrings.REMOVE__MSG__CLEARED_ALL_CLEARS, regionName), true);
} else {
@@ -441,12 +438,12 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
InternalCache cache = getCache();
- if (regionName == null || regionName.isEmpty()) {
+ if (StringUtils.isEmpty(regionName)) {
return DataCommandResult.createGetResult(key, null, null,
CliStrings.GET__MSG__REGIONNAME_EMPTY, false);
}
- if (key == null || key.isEmpty()) {
+ if (StringUtils.isEmpty(key)) {
return DataCommandResult.createGetResult(key, null, null, CliStrings.GET__MSG__KEY_EMPTY,
false);
}
@@ -454,12 +451,13 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
Region region = cache.getRegion(regionName);
if (region == null) {
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Region Not Found - {}", regionName);
+ }
return DataCommandResult.createGetResult(key, null, null,
CliStrings.format(CliStrings.GET__MSG__REGION_NOT_FOUND, regionName), false);
} else {
- Object keyObject = null;
+ Object keyObject;
try {
keyObject = getClassObject(key, keyClass);
} catch (ClassNotFoundException e) {
@@ -480,24 +478,27 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
// run it through post processor. region.get will return the deserialized object already, so
// we don't need to
// deserialize it anymore to pass it to the postProcessor
- value = this.securityService.postProcess(principal, regionName, keyObject, value, false);
+ value = securityService.postProcess(principal, regionName, keyObject, value, false);
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Get for key {} value {}", key, value);
+ }
// return DataCommandResult.createGetResult(key, value, null, null);
Object array[] = getJSONForNonPrimitiveObject(value);
if (value != null) {
DataCommandResult result =
DataCommandResult.createGetResult(key, array[1], null, null, true);
- if (array[0] != null)
+ if (array[0] != null) {
result.setValueClass((String) array[0]);
+ }
return result;
} else {
return DataCommandResult.createGetResult(key, array[1], null, null, false);
}
} else {
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Key is not present in the region {}", regionName);
+ }
return DataCommandResult.createGetInfoResult(key, null, null,
CliStrings.GET__MSG__KEY_NOT_FOUND_REGION, false);
}
@@ -510,71 +511,72 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
InternalCache cache = getCache();
- if (regionPath == null || regionPath.isEmpty()) {
+ if (StringUtils.isEmpty(regionPath)) {
return DataCommandResult.createLocateEntryResult(key, null, null,
CliStrings.LOCATE_ENTRY__MSG__REGIONNAME_EMPTY, false);
}
- if (key == null || key.isEmpty()) {
+ if (StringUtils.isEmpty(key)) {
return DataCommandResult.createLocateEntryResult(key, null, null,
CliStrings.LOCATE_ENTRY__MSG__KEY_EMPTY, false);
}
-
- List<Region> listofRegionStartingwithRegionPath = new ArrayList<Region>();
+ List<Region> listOfRegionsStartingWithRegionPath = new ArrayList<>();
if (recursive) {
// Recursively find the keys starting from the specified region path.
List<String> regionPaths = getAllRegionPaths(cache, true);
- for (int i = 0; i < regionPaths.size(); i++) {
- String path = regionPaths.get(i);
+ for (String path : regionPaths) {
if (path.startsWith(regionPath) || path.startsWith(Region.SEPARATOR + regionPath)) {
Region targetRegion = cache.getRegion(path);
- listofRegionStartingwithRegionPath.add(targetRegion);
+ listOfRegionsStartingWithRegionPath.add(targetRegion);
}
}
- if (listofRegionStartingwithRegionPath.size() == 0) {
- if (logger.isDebugEnabled())
+ if (listOfRegionsStartingWithRegionPath.size() == 0) {
+ if (logger.isDebugEnabled()) {
logger.debug("Region Not Found - {}", regionPath);
+ }
return DataCommandResult.createLocateEntryResult(key, null, null,
CliStrings.format(CliStrings.REMOVE__MSG__REGION_NOT_FOUND, regionPath), false);
}
} else {
Region region = cache.getRegion(regionPath);
if (region == null) {
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Region Not Found - {}", regionPath);
+ }
return DataCommandResult.createLocateEntryResult(key, null, null,
CliStrings.format(CliStrings.REMOVE__MSG__REGION_NOT_FOUND, regionPath), false);
- } else
- listofRegionStartingwithRegionPath.add(region);
+ } else {
+ listOfRegionsStartingWithRegionPath.add(region);
+ }
}
- Object keyObject = null;
+ Object keyObject;
try {
keyObject = getClassObject(key, keyClass);
} catch (ClassNotFoundException e) {
- logger.fatal(e.getMessage(), e);
+ logger.error(e.getMessage(), e);
return DataCommandResult.createLocateEntryResult(key, null, null,
"ClassNotFoundException " + keyClass, false);
} catch (IllegalArgumentException e) {
- logger.fatal(e.getMessage(), e);
+ logger.error(e.getMessage(), e);
return DataCommandResult.createLocateEntryResult(key, null, null,
"Error in converting JSON " + e.getMessage(), false);
}
- Object value = null;
- DataCommandResult.KeyInfo keyInfo = null;
+ Object value;
+ DataCommandResult.KeyInfo keyInfo;
keyInfo = new DataCommandResult.KeyInfo();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
keyInfo.setHost(member.getHost());
keyInfo.setMemberId(member.getId());
keyInfo.setMemberName(member.getName());
- for (Region region : listofRegionStartingwithRegionPath) {
+ for (Region region : listOfRegionsStartingWithRegionPath) {
if (region instanceof PartitionedRegion) {
// Following code is adaptation of which.java of old Gfsh
PartitionedRegion pr = (PartitionedRegion) region;
- Region localRegion = PartitionRegionHelper.getLocalData((PartitionedRegion) region);
+ Region localRegion = PartitionRegionHelper.getLocalData(region);
value = localRegion.get(keyObject);
if (value != null) {
DistributedMember primaryMember =
@@ -584,24 +586,28 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
keyInfo.addLocation(new Object[] {region.getFullPath(), true,
getJSONForNonPrimitiveObject(value)[1], isPrimary, "" + bucketId});
} else {
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Key is not present in the region {}", regionPath);
+ }
return DataCommandResult.createLocateEntryInfoResult(key, null, null,
CliStrings.LOCATE_ENTRY__MSG__KEY_NOT_FOUND_REGION, false);
}
} else {
if (region.containsKey(keyObject)) {
value = region.get(keyObject);
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Get for key {} value {} in region {}", key, value, region.getFullPath());
- if (value != null)
+ }
+ if (value != null) {
keyInfo.addLocation(new Object[] {region.getFullPath(), true,
getJSONForNonPrimitiveObject(value)[1], false, null});
- else
+ } else {
keyInfo.addLocation(new Object[] {region.getFullPath(), false, null, false, null});
+ }
} else {
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled()) {
logger.debug("Key is not present in the region {}", regionPath);
+ }
keyInfo.addLocation(new Object[] {region.getFullPath(), false, null, false, null});
}
}
@@ -619,17 +625,17 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
public DataCommandResult put(String key, String value, boolean putIfAbsent, String keyClass,
String valueClass, String regionName) {
- if (regionName == null || regionName.isEmpty()) {
+ if (StringUtils.isEmpty(regionName)) {
return DataCommandResult.createPutResult(key, null, null,
CliStrings.PUT__MSG__REGIONNAME_EMPTY, false);
}
- if (key == null || key.isEmpty()) {
+ if (StringUtils.isEmpty(key)) {
return DataCommandResult.createPutResult(key, null, null, CliStrings.PUT__MSG__KEY_EMPTY,
false);
}
- if (value == null || value.isEmpty()) {
+ if (StringUtils.isEmpty(value)) {
return DataCommandResult.createPutResult(key, null, null, CliStrings.PUT__MSG__VALUE_EMPTY,
false);
}
@@ -640,8 +646,8 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return DataCommandResult.createPutResult(key, null, null,
CliStrings.format(CliStrings.PUT__MSG__REGION_NOT_FOUND, regionName), false);
} else {
- Object keyObject = null;
- Object valueObject = null;
+ Object keyObject;
+ Object valueObject;
try {
keyObject = getClassObject(key, keyClass);
} catch (ClassNotFoundException e) {
@@ -659,14 +665,16 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
"ClassNotFoundException " + valueClass, false);
}
Object returnValue;
- if (putIfAbsent && region.containsKey(keyObject))
+ if (putIfAbsent && region.containsKey(keyObject)) {
returnValue = region.get(keyObject);
- else
+ } else {
returnValue = region.put(keyObject, valueObject);
+ }
Object array[] = getJSONForNonPrimitiveObject(returnValue);
DataCommandResult result = DataCommandResult.createPutResult(key, array[1], null, null, true);
- if (array[0] != null)
+ if (array[0] != null) {
result.setValueClass((String) array[0]);
+ }
return result;
}
}
@@ -674,53 +682,40 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
@SuppressWarnings({"rawtypes", "unchecked"})
private Object getClassObject(String string, String klassString)
throws ClassNotFoundException, IllegalArgumentException {
- if (klassString == null || klassString.isEmpty())
+ if (StringUtils.isEmpty(klassString)) {
return string;
- else {
- Object o = null;
- Class klass = ClassPathLoader.getLatest().forName(klassString);
-
- if (klass.equals(String.class))
- return string;
+ }
+ Class klass = ClassPathLoader.getLatest().forName(klassString);
- if (JsonUtil.isPrimitiveOrWrapper(klass)) {
- try {
- if (klass.equals(Byte.class)) {
- o = Byte.parseByte(string);
- return o;
- } else if (klass.equals(Short.class)) {
- o = Short.parseShort(string);
- return o;
- } else if (klass.equals(Integer.class)) {
- o = Integer.parseInt(string);
- return o;
- } else if (klass.equals(Long.class)) {
- o = Long.parseLong(string);
- return o;
- } else if (klass.equals(Double.class)) {
- o = Double.parseDouble(string);
- return o;
- } else if (klass.equals(Boolean.class)) {
- o = Boolean.parseBoolean(string);
- return o;
- } else if (klass.equals(Float.class)) {
- o = Float.parseFloat(string);
- return o;
- }
- return o;
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException(
- "Failed to convert input key to " + klassString + " Msg : " + e.getMessage());
- }
- }
+ if (klass.equals(String.class)) {
+ return string;
+ }
+ if (JsonUtil.isPrimitiveOrWrapper(klass)) {
try {
- o = getObjectFromJson(string, klass);
- return o;
- } catch (IllegalArgumentException e) {
- throw e;
+ if (klass.equals(Byte.class)) {
+ return Byte.parseByte(string);
+ } else if (klass.equals(Short.class)) {
+ return Short.parseShort(string);
+ } else if (klass.equals(Integer.class)) {
+ return Integer.parseInt(string);
+ } else if (klass.equals(Long.class)) {
+ return Long.parseLong(string);
+ } else if (klass.equals(Double.class)) {
+ return Double.parseDouble(string);
+ } else if (klass.equals(Boolean.class)) {
+ return Boolean.parseBoolean(string);
+ } else if (klass.equals(Float.class)) {
+ return Float.parseFloat(string);
+ }
+ return null;
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException(
+ "Failed to convert input key to " + klassString + " Msg : " + e.getMessage());
}
}
+
+ return getObjectFromJson(string, klass);
}
@SuppressWarnings({"rawtypes"})
@@ -803,10 +798,11 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
sb.append("{").append(newString.substring(1, len - 1)).append("}");
newString = sb.toString();
}
- V v = JsonUtil.jsonToObject(newString, klass);
- return v;
+ return JsonUtil.jsonToObject(newString, klass);
}
+
+
/**
* Returns a sorted list of all region full paths found in the specified cache.
*
@@ -822,18 +818,17 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
// get a list of all root regions
- Set regions = cache.rootRegions();
- Iterator itor = regions.iterator();
+ Set<Region<?, ?>> regions = cache.rootRegions();
- while (itor.hasNext()) {
- String regionPath = ((Region) itor.next()).getFullPath();
+ for (Region rootRegion : regions) {
+ String regionPath = rootRegion.getFullPath();
Region region = cache.getRegion(regionPath);
list.add(regionPath);
- Set subregionSet = region.subregions(true);
+ Set<Region> subregionSet = region.subregions(true);
if (recursive) {
- for (Iterator subIter = subregionSet.iterator(); subIter.hasNext();) {
- list.add(((Region) subIter.next()).getFullPath());
+ for (Region aSubregionSet : subregionSet) {
+ list.add(aSubregionSet.getFullPath());
}
}
}
@@ -856,7 +851,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
int startCount = args.getInt(DataCommandResult.QUERY_PAGE_START);
int endCount = args.getInt(DataCommandResult.QUERY_PAGE_END);
int rows = args.getInt(DataCommandResult.NUM_ROWS); // returns Zero if no rows added so it
- // works.
+ // works.
boolean flag = args.getBoolean(DataCommandResult.RESULT_FLAG);
CommandResult commandResult = CLIMultiStepHelper.getDisplayResultFromArgs(args);
Gfsh.println();
@@ -865,7 +860,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
if (flag) {
- boolean paginationNeeded = (startCount < rows) && (endCount < rows) && interactive && flag;
+ boolean paginationNeeded = startCount < rows && endCount < rows && interactive;
if (paginationNeeded) {
while (true) {
String message = ("Press n to move to next page, q to quit and p to previous page : ");
@@ -879,17 +874,19 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
new Object[] {nextStart, (nextStart + getPageSize())}, SELECT_STEP_MOVE);
} else if ("p".equals(step)) {
int nextStart = startCount - getPageSize();
- if (nextStart < 0)
+ if (nextStart < 0) {
nextStart = 0;
+ }
return CLIMultiStepHelper.createBannerResult(
new String[] {DataCommandResult.QUERY_PAGE_START,
DataCommandResult.QUERY_PAGE_END},
new Object[] {nextStart, (nextStart + getPageSize())}, SELECT_STEP_MOVE);
- } else if ("q".equals(step))
+ } else if ("q".equals(step)) {
return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
SELECT_STEP_END);
- else
+ } else {
Gfsh.println("Unknown option ");
+ }
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -916,7 +913,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
int endCount = args.getInt(DataCommandResult.QUERY_PAGE_END);
return cachedResult.pageResult(startCount, endCount, SELECT_STEP_DISPLAY);
}
- };
+ }
public static class SelectExecStep extends CLIMultiStepHelper.RemoteStep {
@@ -938,21 +935,23 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
if (interactive) {
endCount = getPageSize();
} else {
- if (result.getSelectResult() != null)
+ if (result.getSelectResult() != null) {
endCount = result.getSelectResult().size();
+ }
}
- if (interactive)
+ if (interactive) {
return result.pageResult(0, endCount, SELECT_STEP_DISPLAY);
- else
+ } else {
return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
SELECT_STEP_END);
+ }
}
public DataCommandResult _select(String query) {
InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
- DataCommandResult dataResult = null;
+ DataCommandResult dataResult;
- if (query == null || query.isEmpty()) {
+ if (StringUtils.isEmpty(query)) {
dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
CliStrings.QUERY__MSG__QUERY_EMPTY, false);
return dataResult;
@@ -964,15 +963,15 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
@SuppressWarnings("deprecation")
QCompiler compiler = new QCompiler();
- Set<String> regionsInQuery = null;
+ Set<String> regionsInQuery;
try {
CompiledValue compiledQuery = compiler.compileQuery(query);
- Set<String> regions = new HashSet<String>();
+ Set<String> regions = new HashSet<>();
compiledQuery.getRegionsInQuery(regions, null);
// authorize data read on these regions
for (String region : regions) {
- this.securityService.authorizeRegionRead(region);
+ securityService.authorizeRegionRead(region);
}
regionsInQuery = Collections.unmodifiableSet(regions);
@@ -984,38 +983,38 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.QUERY);
request.setQuery(query);
- Subject subject = this.securityService.getSubject();
+ Subject subject = securityService.getSubject();
if (subject != null) {
- request.setPrincipal((Serializable) subject.getPrincipal());
+ request.setPrincipal(subject.getPrincipal());
}
dataResult = DataCommands.callFunctionForRegion(request, function, members);
dataResult.setInputQuery(query);
- return (dataResult);
+ return dataResult;
} else {
- return (dataResult =
- DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings.format(
- CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false));
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings.format(
+ CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false);
}
} else {
- return (dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null,
CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY,
"Region mentioned in query probably missing /"),
- false));
+ false);
}
} catch (QueryInvalidException qe) {
logger.error("{} Failed Error {}", query, qe.getMessage(), qe);
- return (dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
- CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false));
+ return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+ CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false);
}
}
private String addLimit(String query) {
if (StringUtils.containsIgnoreCase(query, " limit")
- || StringUtils.containsIgnoreCase(query, " count("))
+ || StringUtils.containsIgnoreCase(query, " count(")) {
return query;
+ }
return query + " limit " + getFetchSize();
}
- };
+ }
public static class SelectQuitStep extends CLIMultiStepHelper.RemoteStep {
@@ -1031,20 +1030,20 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
GfJsonObject args = CLIMultiStepHelper.getStepArgs();
DataCommandResult dataResult = cachedResult;
cachedResult = null;
- if (interactive)
+ if (interactive) {
return CLIMultiStepHelper.createEmptyResult("END");
- else {
+ } else {
CompositeResultData rd = dataResult.toSelectCommandResult();
SectionResultData section = rd.addSection(CLIMultiStepHelper.STEP_SECTION);
section.addData(CLIMultiStepHelper.NEXT_STEP_NAME, "END");
return ResultBuilder.buildResult(rd);
}
}
- };
+ }
public static int getPageSize() {
int pageSize = -1;
- Map<String, String> session = null;
+ Map<String, String> session;
if (CliUtil.isGfshVM()) {
session = Gfsh.getCurrentInstance().getEnv();
} else {
@@ -1052,13 +1051,15 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
if (session != null) {
String size = session.get(Gfsh.ENV_APP_COLLECTION_LIMIT);
- if (size == null || size.isEmpty())
+ if (StringUtils.isEmpty(size)) {
pageSize = Gfsh.DEFAULT_APP_COLLECTION_LIMIT;
- else
+ } else {
pageSize = Integer.parseInt(size);
+ }
}
- if (pageSize == -1)
+ if (pageSize == -1) {
pageSize = Gfsh.DEFAULT_APP_COLLECTION_LIMIT;
+ }
return pageSize;
}
@@ -1068,7 +1069,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
public static String getLogMessage(QueryObserver observer, long startTime, String query) {
String usedIndexesString = null;
- String rowCountString = null;
float time = 0.0f;
if (startTime > 0L) {
@@ -1087,7 +1087,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
buf.append(":");
for (Iterator itr = usedIndexes.entrySet().iterator(); itr.hasNext();) {
Map.Entry entry = (Map.Entry) itr.next();
- buf.append(entry.getKey().toString() + entry.getValue());
+ buf.append(entry.getKey().toString()).append(entry.getValue());
if (itr.hasNext()) {
buf.append(",");
}
@@ -1099,9 +1099,8 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
+ observer.getClass().getName() + ")";
}
- return "Query Executed" + (startTime > 0L ? " in " + time + " ms;" : ";")
- + (rowCountString != null ? rowCountString : "")
- + (usedIndexesString != null ? usedIndexesString : "");
+ return String.format("Query Executed%s%s", startTime > 0L ? " in " + time + " ms;" : ";",
+ usedIndexesString != null ? usedIndexesString : "");
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
index e72654e..fa1e4a5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/TabularResultData.java
@@ -14,20 +14,14 @@
*/
package org.apache.geode.management.internal.cli.result;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
+import java.util.ArrayList;
+import java.util.List;
+
/**
- *
- *
* @since GemFire 7.0
*/
public class TabularResultData extends AbstractResultData {
@@ -70,8 +64,7 @@ public class TabularResultData extends AbstractResultData {
}
/**
- *
- * @param headerText
+ * @param headerText Text to set to header.
* @return this TabularResultData
* @throws ResultDataException If the value is non-finite number or if the key is null.
*/
@@ -80,8 +73,7 @@ public class TabularResultData extends AbstractResultData {
}
/**
- *
- * @param footerText
+ * @param footerText Text to set to footer.
* @return this TabularResultData
* @throws ResultDataException If the value is non-finite number or if the key is null.
*/
@@ -99,62 +91,8 @@ public class TabularResultData extends AbstractResultData {
return gfJsonObject.getString(RESULT_FOOTER);
}
- public Map<String, String> retrieveDataByValueInColumn(String columnName, String valueToSearch) {
- Map<String, String> foundValues = Collections.emptyMap();
- try {
- GfJsonArray jsonArray = contentObject.getJSONArray(columnName);
- int size = jsonArray.size();
- int foundIndex = -1;
- for (int i = 0; i < size; i++) {
- Object object = jsonArray.get(i);
- if (object != null && object.equals(valueToSearch)) {
- foundIndex = i;
- break;
- }
- }
-
- if (foundIndex != -1) {
- foundValues = new LinkedHashMap<String, String>();
- for (Iterator<String> iterator = contentObject.keys(); iterator.hasNext();) {
- String storedColumnNames = (String) iterator.next();
- GfJsonArray storedColumnValues = contentObject.getJSONArray(storedColumnNames);
- foundValues.put(storedColumnNames, String.valueOf(storedColumnValues.get(foundIndex)));
- }
- }
- } catch (GfJsonException e) {
- throw new ResultDataException(e.getMessage());
- }
- return foundValues;
- }
-
- public List<Map<String, String>> retrieveAllDataByValueInColumn(String columnName,
- String valueToSearch) {
- List<Map<String, String>> foundValuesList = new ArrayList<Map<String, String>>();
- try {
- GfJsonArray jsonArray = contentObject.getJSONArray(columnName);
- int size = jsonArray.size();
- for (int i = 0; i < size; i++) {
- Object object = jsonArray.get(i);
- if (object != null && object.equals(valueToSearch)) {
- Map<String, String> foundValues = new LinkedHashMap<String, String>();
-
- for (Iterator<String> iterator = contentObject.keys(); iterator.hasNext();) {
- String storedColumnNames = (String) iterator.next();
- GfJsonArray storedColumnValues = contentObject.getJSONArray(storedColumnNames);
- foundValues.put(storedColumnNames, String.valueOf(storedColumnValues.get(i)));
- }
-
- foundValuesList.add(foundValues);
- }
- }
- } catch (GfJsonException e) {
- throw new ResultDataException(e.getMessage());
- }
- return foundValuesList;
- }
-
public List<String> retrieveAllValues(String columnName) {
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
try {
GfJsonArray jsonArray = contentObject.getJSONArray(columnName);
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 1af6261..eff4d29 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -14,19 +14,17 @@
*/
package org.apache.geode.cache.query.dunit;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.junit.experimental.categories.Category;
import org.junit.Test;
import static org.junit.Assert.*;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheFactory;
@@ -38,16 +36,13 @@ import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.query.Index;
-import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
-import org.apache.geode.cache.query.partitioned.PRQueryDUnitHelper;
import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.internal.cache.execute.PRClientServerTestBase;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -92,17 +87,14 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
public static volatile boolean hooked = false;
- /**
- * @param name
- */
public QueryDataInconsistencyDUnitTest() {
super();
}
@Override
public final void postTearDownCacheTestCase() throws Exception {
- Invoke.invokeInEveryVM(() -> disconnectFromDS());
- Invoke.invokeInEveryVM(() -> QueryObserverHolder.reset());
+ Invoke.invokeInEveryVM(JUnit4DistributedTestCase::disconnectFromDS);
+ Invoke.invokeInEveryVM(QueryObserverHolder::reset);
}
@Override
@@ -544,8 +536,8 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
}
private void createCacheClientWithoutReg(String host, Integer port1) {
- this.disconnectFromDS();
- ClientCache cache = new ClientCacheFactory().addPoolServer(host, port1).create();
+ disconnectFromDS();
+ new ClientCacheFactory().addPoolServer(host, port1).create();
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 2af3fea..14d4d3f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -218,8 +218,8 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
- final String vm2MemberId = (String) vm2.invoke(() -> getMemberId());
+ final String vm1MemberId = vm1.invoke(() -> getMemberId());
+ final String vm2MemberId = vm2.invoke(() -> getMemberId());
getLogWriter().info("Vm1 ID : " + vm1MemberId);
getLogWriter().info("Vm2 ID : " + vm2MemberId);
@@ -457,9 +457,13 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
doQueryRegionsAssociatedMembers(queryTemplate1, -1, false,
new String[] {DATA_PAR_REGION_NAME_VM2_PATH, "/jfgkdfjgkd"}); // one wrong region
doQueryRegionsAssociatedMembers(queryTemplate1, -1, true,
- new String[] {"/dhgfdhgf", "/dhgddhd"}); // both regions wrong
+ new String[] {"/dhgfdhgf", "/dhgddhd"}); // both
+ // regions
+ // wrong
doQueryRegionsAssociatedMembers(queryTemplate1, -1, false,
- new String[] {"/dhgfdhgf", "/dhgddhd"}); // both regions wrong
+ new String[] {"/dhgfdhgf", "/dhgddhd"}); // both
+ // regions
+ // wrong
}
});
}
@@ -1961,13 +1965,9 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
return false;
} else {
// verify that bean is proper before executing tests
- if (bean.getMembers() != null && bean.getMembers().length > 1
+ return bean.getMembers() != null && bean.getMembers().length > 1
&& bean.getMemberCount() > 0
- && service.getDistributedSystemMXBean().listRegions().length >= 2) {
- return true;
- } else {
- return false;
- }
+ && service.getDistributedSystemMXBean().listRegions().length >= 2;
}
}
@@ -2037,7 +2037,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final VM manager = Host.getHost(0).getVM(0);
manager.invoke(checkRegionMBeans);
- getLogWriter().info("testRebalanceCommandForSimulate verified Mbean and executin command");
+ getLogWriter().info("testRebalanceCommandForSimulate verified Mbean and executing command");
String command = "rebalance --simulate=true --include-region=" + "/" + REBALANCE_REGION_NAME;
CommandResult cmdResult = executeCommand(command);
getLogWriter().info("testRebalanceCommandForSimulate just after executing " + cmdResult);
@@ -2298,11 +2298,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
getLogWriter().info(
"waitForListClientMbean Still probing for DistributedRegionMXBean with separator Not null "
+ bean2.getMembers().length);
- if (bean2.getMembers().length > 1) {
- return true;
- } else {
- return false;
- }
+ return bean2.getMembers().length > 1;
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
new file mode 100644
index 0000000..a9a29a0
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
@@ -0,0 +1,220 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.management.internal.cli.functions;
+
+import static org.apache.geode.management.internal.cli.domain.DataCommandResult.MISSING_VALUE;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
+import org.apache.geode.management.internal.cli.domain.DataCommandResult;
+import org.apache.geode.management.internal.cli.json.GfJsonArray;
+import org.apache.geode.management.internal.cli.json.GfJsonException;
+import org.apache.geode.management.internal.cli.json.GfJsonObject;
+import org.apache.geode.management.internal.cli.result.CompositeResultData;
+import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(IntegrationTest.class)
+public class DataCommandFunctionWithPDXJUnitTest {
+ private static final String PARTITIONED_REGION = "part_region";
+
+ @Rule
+ public ServerStarterRule server = new ServerStarterRule().withPDXPersistent()
+ .withRegion(RegionShortcut.PARTITION, PARTITIONED_REGION);
+
+ private Customer alice;
+ private Customer bob;
+ private CustomerWithPhone charlie;
+ private CustomerWithPhone dan;
+
+ @Before
+ public void setup() {
+ alice = new Customer("0", "Alice", "Anderson");
+ bob = new Customer("1", "Bob", "Bailey");
+ charlie = new CustomerWithPhone("2", "Charlie", "Chaplin", "(222) 222-2222");
+ dan = new CustomerWithPhone("3", "Dan", "Dickinson", "(333) 333-3333");
+
+ Region region = server.getCache().getRegion(PARTITIONED_REGION);
+ region.put(0, alice);
+ region.put(1, bob);
+ region.put(2, charlie);
+ region.put(3, dan);
+ }
+
+ // GEODE-2662: building a table where early values are missing keys causes the data to shift
+ // upward during reporting.
+ @Test
+ public void testTableIsRectangular() throws GfJsonException {
+ TabularResultData rawTable = getTableFromQuery("select * from /" + PARTITIONED_REGION);
+ // Verify any table built
+ assertThat(rawTable.getGfJsonObject()).isNotNull();
+ assertThat(rawTable.getGfJsonObject().getJSONObject("content")).isNotNull();
+ GfJsonObject tableJson = rawTable.getGfJsonObject().getJSONObject("content");
+ // Verify table is rectangular
+ SoftAssertions softly = new SoftAssertions();
+ for (String k : new String[] {"id", "phone", "firstName", "lastName"}) {
+ softly.assertThat(tableJson.getJSONArray(k).size()).isEqualTo(4);
+ }
+ softly.assertAll();
+ }
+
+ @Test
+ public void testVerifyDataDoesNotShift() throws Exception {
+ TabularResultData rawTable =
+ getTableFromQuery("select * from /" + PARTITIONED_REGION + " order by id");
+ // Verify any table built
+ assertThat(rawTable.getGfJsonObject()).isNotNull();
+ assertThat(rawTable.getGfJsonObject().getJSONObject("content")).isNotNull();
+ GfJsonObject tableJson = rawTable.getGfJsonObject().getJSONObject("content");
+ // Table only contains correct keys
+ assertThat(tableJson.getJSONArray("missingKey")).isNull();
+
+ // Table contains correct data
+ assertThatRowIsBuiltCorrectly(tableJson, 0, alice);
+ assertThatRowIsBuiltCorrectly(tableJson, 1, bob);
+ assertThatRowIsBuiltCorrectly(tableJson, 2, charlie);
+ assertThatRowIsBuiltCorrectly(tableJson, 3, dan);
+ }
+
+ @Test
+ public void testFilteredQueryWithPhone() throws Exception {
+ TabularResultData rawTable = getTableFromQuery(
+ "select * from /" + PARTITIONED_REGION + " c where IS_DEFINED ( c.phone ) order by id");
+ assertThat(rawTable.getGfJsonObject()).isNotNull();
+ assertThat(rawTable.getGfJsonObject().getJSONObject("content")).isNotNull();
+ GfJsonObject tableJson = rawTable.getGfJsonObject().getJSONObject("content");
+ for (String k : new String[] {"id", "phone", "firstName", "lastName"}) {
+ assertThat(tableJson.getJSONArray(k).size()).isEqualTo(2);
+ }
+ assertThatRowIsBuiltCorrectly(tableJson, 0, charlie);
+ assertThatRowIsBuiltCorrectly(tableJson, 1, dan);
+ }
+
+
+ @Test
+ public void testFilteredQueryWithoutPhone() throws Exception {
+ TabularResultData rawTable = getTableFromQuery(
+ "select * from /" + PARTITIONED_REGION + " c where IS_UNDEFINED ( c.phone ) order by id");
+ assertThat(rawTable.getGfJsonObject()).isNotNull();
+ assertThat(rawTable.getGfJsonObject().getJSONObject("content")).isNotNull();
+ GfJsonObject tableJson = rawTable.getGfJsonObject().getJSONObject("content");
+ for (String k : new String[] {"id", "firstName", "lastName"}) {
+ assertThat(tableJson.getJSONArray(k).size()).isEqualTo(2);
+ }
+ assertThatRowIsBuiltCorrectly(tableJson, 0, alice);
+ assertThatRowIsBuiltCorrectly(tableJson, 1, bob);
+ }
+
+ private TabularResultData getTableFromQuery(String query) {
+ DataCommandRequest request = new DataCommandRequest();
+ request.setQuery(query);
+ DataCommandResult result = new DataCommandFunction().select(request);
+ CompositeResultData r = result.toSelectCommandResult();
+ return r.retrieveSectionByIndex(0).retrieveTableByIndex(0);
+ }
+
+
+ private void assertThatRowIsBuiltCorrectly(GfJsonObject table, int rowNum, Customer customer)
+ throws Exception {
+ SoftAssertions softly = new SoftAssertions();
+ String id = (String) table.getJSONArray("id").get(rowNum);
+ String firstName = (String) table.getJSONArray("firstName").get(rowNum);
+ String lastName = (String) table.getJSONArray("lastName").get(rowNum);
+
+ softly.assertThat(id).describedAs("Customer ID").isEqualTo(customer.id);
+ softly.assertThat(firstName).describedAs("First name").isEqualTo(customer.firstName);
+ softly.assertThat(lastName).describedAs("Last name").isEqualTo(customer.lastName);
+
+ GfJsonArray phoneArray = table.getJSONArray("phone");
+
+ if (phoneArray == null) {
+ softly.assertThat(customer).describedAs("No phone data")
+ .isNotInstanceOf(CustomerWithPhone.class);
+ } else {
+ String phone = (String) phoneArray.get(rowNum);
+
+ if (customer instanceof CustomerWithPhone) {
+ softly.assertThat(phone).describedAs("Phone")
+ .isEqualTo(((CustomerWithPhone) customer).phone);
+ } else {
+ softly.assertThat(phone).describedAs("Phone (missing)").isEqualTo(MISSING_VALUE);
+ }
+ }
+ softly.assertAll();
+ }
+
+ public static class Customer implements PdxSerializable {
+ protected String id;
+ protected String firstName;
+ protected String lastName;
+
+ Customer() {}
+
+ Customer(String id, String firstName, String lastName) {
+ this.id = id;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
+
+ @Override
+ public void toData(PdxWriter writer) {
+ writer.writeString("id", id).markIdentityField("id").writeString("firstName", firstName)
+ .writeString("lastName", lastName);
+ }
+
+ @Override
+ public void fromData(PdxReader reader) {
+ id = reader.readString("id");
+ firstName = reader.readString("firstName");
+ lastName = reader.readString("lastName");
+ }
+ }
+
+ public static class CustomerWithPhone extends Customer {
+ private String phone;
+
+ CustomerWithPhone(String id, String firstName, String lastName, String phone) {
+ this.id = id;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.phone = phone;
+ }
+
+ @Override
+ public void toData(PdxWriter writer) {
+ writer.writeString("id", id).markIdentityField("id").writeString("firstName", firstName)
+ .writeString("lastName", lastName).writeString("phone", phone);
+ }
+
+ @Override
+ public void fromData(PdxReader reader) {
+ id = reader.readString("id");
+ firstName = reader.readString("firstName");
+ lastName = reader.readString("lastName");
+ phone = reader.readString("phone");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/9af854aa/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
index ead1047..30ae59f 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
@@ -54,6 +54,7 @@ public class ServerStarterRule extends MemberStarterRule<ServerStarterRule> impl
private transient Cache cache;
private transient CacheServer server;
private int embeddedLocatorPort = -1;
+ private boolean pdxPersistent = false;
private Map<String, RegionShortcut> regions = new HashMap<>();
@@ -107,6 +108,13 @@ public class ServerStarterRule extends MemberStarterRule<ServerStarterRule> impl
}
}
+ public ServerStarterRule withPDXPersistent() {
+ pdxPersistent = true;
+ return this;
+ }
+
+
+
public ServerStarterRule withEmbeddedLocator() {
embeddedLocatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
properties.setProperty("start-locator", "localhost[" + embeddedLocatorPort + "]");
@@ -127,9 +135,6 @@ public class ServerStarterRule extends MemberStarterRule<ServerStarterRule> impl
return this;
}
- public void startServer() {
- startServer(false);
- }
public ServerStarterRule withRegion(RegionShortcut type, String name) {
this.autoStart = true;
@@ -141,7 +146,7 @@ public class ServerStarterRule extends MemberStarterRule<ServerStarterRule> impl
withProperties(properties).withConnectionToLocator(locatorPort).startServer();
}
- public void startServer(boolean pdxPersistent) {
+ public void startServer() {
CacheFactory cf = new CacheFactory(this.properties);
cf.setPdxReadSerialized(pdxPersistent);
cf.setPdxPersistent(pdxPersistent);
[68/69] [abbrv] geode git commit: GEODE-2582: Add get request;
add serializer to new protocol handler.
Posted by ud...@apache.org.
GEODE-2582: Add get request; add serializer to new protocol handler.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9973c493
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9973c493
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9973c493
Branch: refs/heads/feature/GEODE-2580
Commit: 9973c4938a0c27f0a53aedf3460995a47ce78427
Parents: 511e2a3
Author: Galen OSullivan <go...@pivotal.io>
Authored: Thu May 18 17:17:09 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon May 22 11:27:03 2017 -0700
----------------------------------------------------------------------
.../client/NewClientProtocolTestClient.java | 6 +-
.../client/ProtobufProtocolMessageHandler.java | 49 ++++++++++++----
.../geode/protocol/client/MessageUtils.java | 15 +++++
.../client/ProtobufProtocolIntegrationTest.java | 62 ++++++++++++++++++--
...rotobufSerializationDeserializationTest.java | 4 +-
.../sockets/ClientProtocolMessageHandler.java | 5 +-
.../cache/tier/sockets/ServerConnection.java | 3 +-
7 files changed, 120 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
index a4476e1..834d2f6 100644
--- a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
+++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/NewClientProtocolTestClient.java
@@ -43,6 +43,8 @@ public class NewClientProtocolTestClient implements AutoCloseable {
socketChannel = SocketChannel.open(new InetSocketAddress(hostname, port));
inputStream = socketChannel.socket().getInputStream();
outputStream = socketChannel.socket().getOutputStream();
+
+ sendHeader(outputStream);
}
@Override
@@ -55,15 +57,13 @@ public class NewClientProtocolTestClient implements AutoCloseable {
}
public Message blockingSendMessage(Message message) throws IOException {
- sendHeader(outputStream);
-
message.writeDelimitedTo(outputStream);
outputStream.flush();
return ClientProtocol.Message.parseDelimitedFrom(inputStream);
}
- void parseResponse(Message response) {
+ void printResponse(Message response) {
System.out.println("response = " + response.toString());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
index a6993c4..10ad7e9 100644
--- a/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
+++ b/geode-client-protobuf/src/main/java/org/apache/geode/protocol/client/ProtobufProtocolMessageHandler.java
@@ -16,7 +16,6 @@
package org.apache.geode.protocol.client;
import com.google.protobuf.ByteString;
-import com.google.protobuf.Parser;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.Region;
@@ -24,10 +23,11 @@ import org.apache.geode.cache.TimeoutException;
import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.RegionAPI.GetRequest;
-import org.apache.geode.protocol.protobuf.RegionAPI.GetResponse;
import org.apache.geode.protocol.protobuf.RegionAPI.PutResponse;
import org.apache.geode.serialization.Deserializer;
+import org.apache.geode.serialization.Serializer;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
@@ -49,7 +49,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
@Override
public void receiveMessage(InputStream inputStream, OutputStream outputStream,
- Deserializer deserializer, Cache cache) throws IOException {
+ Deserializer deserializer, Serializer serializer, Cache cache) throws IOException {
final Message message = Message.parseDelimitedFrom(inputStream);
// can be null at EOF, see Parser.parseDelimitedFrom(java.io.InputStream)
if (message == null) {
@@ -61,14 +61,23 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
logger.error(() -> "Got message of type response: " + ErrorMessageFromMessage(message));
}
- Request request = message.getRequest();
- Message putResponseMessage = doPutRequest(request.getPutRequest(), deserializer, cache);
+ Message responseMessage = null;
- putResponseMessage.writeDelimitedTo(outputStream);
+ Request request = message.getRequest();
+ Request.RequestAPICase requestAPICase = request.getRequestAPICase();
+ if (requestAPICase == Request.RequestAPICase.GETREQUEST) {
+ responseMessage = doGetRequest(request.getGetRequest(), deserializer, serializer, cache);
+ } else if (requestAPICase == Request.RequestAPICase.PUTREQUEST) {
+ responseMessage = doPutRequest(request.getPutRequest(), deserializer, cache);
+ } else {
+ // TODO
+ }
+ if (responseMessage != null) {
+ responseMessage.writeDelimitedTo(outputStream);
+ }
}
private Message doPutRequest(PutRequest request, Deserializer dataDeserializer, Cache cache) {
- logger.error("Doing put request.");
final String regionName = request.getRegionName();
final BasicTypes.Entry entry = request.getEntry();
final ByteString key = entry.getKey().getKey();
@@ -80,7 +89,7 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
dataDeserializer.deserialize(value.toByteArray()));
return putResponseWithStatus(true);
} catch (TimeoutException | CacheWriterException ex) {
- logger.error("Caught normal-ish exception doing region put", ex);
+ logger.warn("Caught normal-ish exception doing region put", ex);
return putResponseWithStatus(false);
}
}
@@ -91,9 +100,27 @@ public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHand
.build();
}
- private GetResponse doGetRequest(GetRequest request, Deserializer deserializer, Cache cache) {
- // TODO
- return null;
+ private Message doGetRequest(GetRequest request, Deserializer deserializer, Serializer serializer, Cache cache) {
+ String regionName = request.getRegionName();
+ BasicTypes.Key key = request.getKey();
+ byte[] keyBytes = key.getKey().toByteArray();
+ Region<Object, Object> region = cache.getRegion(regionName);
+
+ Object returnValue = region.get(deserializer.deserialize(keyBytes));
+
+ if (returnValue == null) {
+ return getResponseWithValue(new byte[0]);
+ } else {
+ // TODO types in the region?
+ return getResponseWithValue(serializer.serialize(returnValue));
+ }
+ }
+
+ private Message getResponseWithValue(byte[] value) {
+ return Message.newBuilder()
+ .setResponse(Response.newBuilder().setGetResponse(RegionAPI.GetResponse.newBuilder()
+ .setResult(BasicTypes.Value.newBuilder().setValue(ByteString.copyFrom(value)))))
+ .build();
}
public ProtobufProtocolMessageHandler() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
index 02e2a58..4991467 100644
--- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/MessageUtils.java
@@ -82,6 +82,21 @@ public class MessageUtils {
return message.build();
}
+ public static ClientProtocol.Message makeGetMessageFor(String region, String key) {
+ Random random = new Random();
+ ClientProtocol.MessageHeader.Builder messageHeader =
+ ClientProtocol.MessageHeader.newBuilder().setCorrelationId(random.nextInt());
+
+ BasicTypes.Key.Builder keyBuilder =
+ BasicTypes.Key.newBuilder().setKey(ByteString.copyFromUtf8(key));
+
+ RegionAPI.GetRequest.Builder getRequest = RegionAPI.GetRequest.newBuilder().setRegionName(region).setKey(keyBuilder);
+ ClientProtocol.Request.Builder request = ClientProtocol.Request.newBuilder().setGetRequest(getRequest);
+
+ return ClientProtocol.Message.newBuilder().setMessageHeader(messageHeader).setRequest(request)
+ .build();
+ }
+
private static byte[] createByteArrayOfSize(int msgSize) {
byte[] array = new byte[msgSize];
for (int i = 0; i < msgSize; i++) {
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
index 5d92cf0..b3864a2 100644
--- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufProtocolIntegrationTest.java
@@ -15,11 +15,13 @@
package org.apache.geode.protocol.client;
+import com.google.protobuf.ByteString;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.ClientProtocol;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Test;
@@ -28,12 +30,15 @@ import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.util.Properties;
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Message.MessageTypeCase.RESPONSE;
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Response.ResponseAPICase.GETRESPONSE;
+import static org.apache.geode.protocol.protobuf.ClientProtocol.Response.ResponseAPICase.PUTRESPONSE;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
public class ProtobufProtocolIntegrationTest {
@Test
- public void testRoundTripClientCommunicationWorks() throws IOException {
+ public void testRoundTripPutRequest() throws IOException {
try (Cache cache = createCacheOnPort(40404);
NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
final String testRegion = "testRegion";
@@ -44,11 +49,11 @@ public class ProtobufProtocolIntegrationTest {
ClientProtocol.Message message =
MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
ClientProtocol.Message response = client.blockingSendMessage(message);
- client.parseResponse(response);
+ client.printResponse(response);
- assertEquals(response.getMessageTypeCase(), ClientProtocol.Message.MessageTypeCase.RESPONSE);
- assertEquals(response.getResponse().getResponseAPICase(),
- ClientProtocol.Response.ResponseAPICase.PUTRESPONSE);
+ assertEquals(RESPONSE, response.getMessageTypeCase());
+ assertEquals(PUTRESPONSE,
+ response.getResponse().getResponseAPICase());
assertTrue(response.getResponse().getPutResponse().getSuccess());
assertEquals(1, region.size());
@@ -58,6 +63,53 @@ public class ProtobufProtocolIntegrationTest {
}
@Test
+ public void testRoundTripEmptyGetRequest() throws IOException {
+ try (Cache cache = createCacheOnPort(40404);
+ NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
+ final String testRegion = "testRegion";
+ final String testKey = "testKey";
+ Region<Object, Object> region = cache.createRegionFactory().create("testRegion");
+
+ ClientProtocol.Message message = MessageUtils.makeGetMessageFor(testRegion, testKey);
+ ClientProtocol.Message response = client.blockingSendMessage(message);
+
+ assertEquals(RESPONSE, response.getMessageTypeCase());
+ assertEquals(GETRESPONSE,
+ response.getResponse().getResponseAPICase());
+ BasicTypes.Value value = response.getResponse().getGetResponse().getResult();
+
+ assertTrue(value.getValue().isEmpty());
+ }
+ }
+
+ @Test
+ public void testRoundTripNonEmptyGetRequest() throws IOException {
+ try (Cache cache = createCacheOnPort(40404);
+ NewClientProtocolTestClient client = new NewClientProtocolTestClient("localhost", 40404)) {
+ final String testRegion = "testRegion";
+ final String testKey = "testKey";
+ final String testValue = "testValue";
+ Region<Object, Object> region = cache.createRegionFactory().create("testRegion");
+
+
+ ClientProtocol.Message putMessage =
+ MessageUtils.makePutMessageFor(testRegion, testKey, testValue);
+ ClientProtocol.Message putResponse = client.blockingSendMessage(putMessage);
+ client.printResponse(putResponse);
+
+ ClientProtocol.Message getMessage = MessageUtils.makeGetMessageFor(testRegion, testKey);
+ ClientProtocol.Message getResponse = client.blockingSendMessage(getMessage);
+
+ assertEquals(RESPONSE, getResponse.getMessageTypeCase());
+ assertEquals(GETRESPONSE,
+ getResponse.getResponse().getResponseAPICase());
+ BasicTypes.Value value = getResponse.getResponse().getGetResponse().getResult();
+
+ assertEquals(value.getValue().toStringUtf8(), testValue);
+ }
+ }
+
+ @Test
public void startCache() throws IOException {
try (Cache cache = createCacheOnPort(40404)) {
while (true) {
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
----------------------------------------------------------------------
diff --git a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
index 8cf36ca..05d2216 100644
--- a/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
+++ b/geode-client-protobuf/src/test/java/org/apache/geode/protocol/client/ProtobufSerializationDeserializationTest.java
@@ -66,7 +66,7 @@ public class ProtobufSerializationDeserializationTest {
ProtobufProtocolMessageHandler newClientProtocol = new ProtobufProtocolMessageHandler();
newClientProtocol.receiveMessage(MessageUtils.loadMessageIntoInputStream(message),
- mockOutputStream, deserializer, mockCache);
+ mockOutputStream, deserializer, SerializationType.STRING.serializer, mockCache);
verify(mockRegion).put(testKey.getBytes(), testValue.getBytes());
}
@@ -86,7 +86,7 @@ public class ProtobufSerializationDeserializationTest {
ProtobufProtocolMessageHandler newClientProtocol = new ProtobufProtocolMessageHandler();
newClientProtocol.receiveMessage(MessageUtils.loadMessageIntoInputStream(message), outputStream,
- deserializer, mockCache);
+ deserializer, SerializationType.STRING.serializer, mockCache);
ClientProtocol.Message responseMessage = ClientProtocol.Message
.parseDelimitedFrom(new ByteArrayInputStream(outputStream.toByteArray()));
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
index aa6d4cb..e7e75bf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
@@ -17,12 +17,13 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.apache.geode.cache.Cache;
import org.apache.geode.serialization.Deserializer;
+import org.apache.geode.serialization.Serializer;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
public interface ClientProtocolMessageHandler {
- void receiveMessage(InputStream inputStream, OutputStream outputStream, Deserializer serializer,
- Cache cache) throws IOException;
+ void receiveMessage(InputStream inputStream, OutputStream outputStream, Deserializer deserializer,
+ Serializer serializer, Cache cache) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9973c493/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index e58e213..58f1709 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -957,7 +957,8 @@ public class ServerConnection implements Runnable {
OutputStream outputStream = socket.getOutputStream();
// TODO serialization types?
newClientProtocol.receiveMessage(inputStream, outputStream,
- SerializationType.STRING.deserializer, this.getCache());
+ SerializationType.STRING.deserializer, SerializationType.STRING.serializer,
+ this.getCache());
} catch (IOException e) {
// TODO?
}
[26/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 2adfc4b..19ad7fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -15,48 +15,79 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
-// lru: LRU
-// stats: STATS
+// disk: 1
+// lru: 1
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegionEntryOffHeap {
public VMStatsDiskLRURegionEntryOffHeapUUIDKey(RegionEntryContext context, UUID key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -65,6 +96,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
private static final AtomicLongFieldUpdater<VMStatsDiskLRURegionEntryOffHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapUUIDKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -95,13 +127,19 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -117,7 +155,9 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -141,7 +181,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -152,19 +192,22 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// 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) {
@@ -181,7 +224,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), null);
setEntrySize(newSize);
@@ -189,7 +232,9 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
return delta;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -214,7 +259,6 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -254,108 +298,113 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
// // 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) {
+
DiskStoreImpl ds = r.getDiskStore();
long maxOplogSize = ds.getMaxOplogSize();
this.id = DiskId.createDiskId(maxOplogSize, false /* over flow only */, ds.needsLinkedList());
+
+
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -365,7 +414,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -375,6 +424,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskLRURegionEntryOffHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskLRURegionEntryOffHeapUUIDKey.class,
"hitCount");
@@ -383,7 +433,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
"missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -392,12 +442,12 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -410,14 +460,15 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -429,13 +480,17 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -448,5 +503,8 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
index c81af7b..8cda823 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
@@ -15,39 +15,68 @@
package org.apache.geode.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 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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapIntKey(RegionEntryContext context, int key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapIntKey(RegionEntryContext context, int key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -55,10 +84,11 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapIntKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +108,7 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,19 +119,22 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -111,7 +144,9 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -136,7 +171,6 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -176,10 +210,14 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -189,7 +227,7 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -199,13 +237,14 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -214,12 +253,12 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -232,14 +271,15 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -251,12 +291,18 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -267,5 +313,8 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
index 5c17dec..88b6e29 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
@@ -15,39 +15,68 @@
package org.apache.geode.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 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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapLongKey(RegionEntryContext context, long key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapLongKey(RegionEntryContext context, long key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -55,10 +84,11 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapLongKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +108,7 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,19 +119,22 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -111,7 +144,9 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -136,7 +171,6 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -176,10 +210,14 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -189,7 +227,7 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -199,13 +237,14 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -214,12 +253,12 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -232,14 +271,15 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -251,12 +291,16 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -267,5 +311,8 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
index 2ae6d7a..1d6a464 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
@@ -15,39 +15,67 @@
package org.apache.geode.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 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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapObjectKey(RegionEntryContext context, Object key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -55,10 +83,11 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapObjectKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -78,7 +107,7 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -89,19 +118,22 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -111,7 +143,9 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -136,7 +170,6 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -176,10 +209,14 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -189,7 +226,7 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -199,13 +236,14 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapObjectKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapObjectKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapObjectKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapObjectKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -214,12 +252,12 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -232,14 +270,15 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -251,13 +290,20 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
index 44b1962..52ab683 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
@@ -15,17 +15,25 @@
package org.apache.geode.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 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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -33,18 +41,34 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapStringKey1(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -63,9 +87,11 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -73,10 +99,11 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey1.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -96,7 +123,7 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -107,19 +134,22 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -129,7 +159,9 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -154,7 +186,6 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -194,10 +225,14 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -207,7 +242,7 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -217,13 +252,14 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapStringKey1> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey1.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapStringKey1> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey1.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -232,12 +268,12 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -250,14 +286,15 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -269,8 +306,12 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -284,7 +325,7 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -303,6 +344,7 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -332,5 +374,8 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
index 9b481c9..2dc2ae6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
@@ -15,17 +15,25 @@
package org.apache.geode.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 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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
@@ -34,17 +42,33 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key, Object value,
- boolean byteEncode) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapStringKey2(RegionEntryContext context, String key,
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -75,9 +99,11 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -85,10 +111,11 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey2.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -108,7 +135,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -119,19 +146,22 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -141,7 +171,9 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -166,7 +198,6 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -206,10 +237,14 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -219,7 +254,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -229,13 +264,14 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapStringKey2> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey2.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapStringKey2> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapStringKey2.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -244,12 +280,12 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -262,14 +298,15 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -281,8 +318,12 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -301,7 +342,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -331,6 +372,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -373,5 +415,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
index e2d498d..138b3da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
@@ -15,41 +15,71 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
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.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHeap {
- public VMStatsDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key, Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+ public VMStatsDiskRegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (value instanceof RecoveredEntry ? null : value)
+
+
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
initialize(context, value);
+
+
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -57,10 +87,11 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapUUIDKey.class, "lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -80,7 +111,7 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -91,19 +122,22 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -113,7 +147,9 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -138,7 +174,6 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -178,10 +213,14 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -191,7 +230,7 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -201,13 +240,14 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapUUIDKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapUUIDKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryHeapUUIDKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryHeapUUIDKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -216,12 +256,12 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -234,14 +274,15 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -253,13 +294,17 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -272,5 +317,8 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
index e7c90b7..67a2eea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
@@ -15,44 +15,73 @@
package org.apache.geode.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 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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -60,6 +89,7 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -90,13 +120,19 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -112,7 +148,9 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -136,7 +174,7 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -147,19 +185,22 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -169,7 +210,9 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -194,7 +237,6 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -234,10 +276,14 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -247,7 +293,7 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -257,13 +303,14 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapIntKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapIntKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -272,12 +319,12 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -290,14 +337,15 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -309,12 +357,18 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -325,5 +379,8 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
index 62e6cc7..f218b04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
@@ -15,44 +15,73 @@
package org.apache.geode.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 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.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
-// disk: DISK
+// disk: 1
// lru: LRU
-// stats: STATS
+// stats: 1
// versioned: VERSIONED
-// offheap: OFFHEAP
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntryOffHeap {
public VMStatsDiskRegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, (value instanceof RecoveredEntry ? null : value));
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+ (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;
@@ -60,6 +89,7 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
private volatile long lastModified;
private static final AtomicLongFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, "lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -90,13 +120,19 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -112,7 +148,9 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -136,7 +174,7 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -147,19 +185,22 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// disk code
+
protected void initialize(RegionEntryContext context, Object value) {
diskInitialize(context, value);
}
@@ -169,7 +210,9 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
throw new IllegalStateException("should never be called");
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private void diskInitialize(RegionEntryContext context, Object value) {
DiskRecoveryStore drs = (DiskRecoveryStore) context;
DiskStoreImpl ds = drs.getDiskStore();
@@ -194,7 +237,6 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
void setDiskId(RegionEntry old) {
this.id = ((AbstractDiskRegionEntry) old).getDiskId();
}
-
// // inlining DiskId
// // always have these fields
// /**
@@ -234,10 +276,14 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
// // persistent
// /** unique entry identifier * */
// private long keyId;
+
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time) {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -247,7 +293,7 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -257,13 +303,14 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
private volatile long lastAccessed;
private volatile int hitCount;
private volatile int missCount;
+
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> hitCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, "hitCount");
private static final AtomicIntegerFieldUpdater<VMStatsDiskRegionEntryOffHeapLongKey> missCountUpdater =
AtomicIntegerFieldUpdater.newUpdater(VMStatsDiskRegionEntryOffHeapLongKey.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
@@ -272,12 +319,12 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
@@ -290,14 +337,15 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this, 0);
missCountUpdater.set(this, 0);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -309,12 +357,16 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
return true;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -325,5 +377,8 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[29/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 14edad9..1d65579 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -107,7 +107,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
}
/** Return the absolute time when TTL expiration occurs, or 0 if not used */
- public final long getTTLExpirationTime() throws EntryNotFoundException {
+ public long getTTLExpirationTime() throws EntryNotFoundException {
long ttl = getTTLAttributes().getTimeout();
long tilt = 0;
if (ttl > 0) {
@@ -120,7 +120,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
}
/** Return the absolute time when idle expiration occurs, or 0 if not used */
- public final long getIdleExpirationTime() throws EntryNotFoundException {
+ public long getIdleExpirationTime() throws EntryNotFoundException {
long idle = getIdleAttributes().getTimeout();
long tilt = 0;
if (idle > 0) {
@@ -136,7 +136,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
* Returns the number of milliseconds until this task should expire. The return value will never
* be negative.
*/
- final long getExpiryMillis() throws EntryNotFoundException {
+ long getExpiryMillis() throws EntryNotFoundException {
long extm = getExpirationTime() - getNow();
if (extm < 0L)
return 0L;
@@ -185,13 +185,13 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
*
* @since GemFire 5.0
*/
- public final static void suspendExpiration() {
+ public static void suspendExpiration() {
synchronized (suspendLock) {
expirationSuspended = true;
}
}
- public final static void permitExpiration() {
+ public static void permitExpiration() {
synchronized (suspendLock) {
expirationSuspended = false;
suspendLock.notifyAll();
@@ -204,7 +204,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
*
* @since GemFire 5.0
*/
- private final void waitOnExpirationSuspension() {
+ private void waitOnExpirationSuspension() {
for (;;) {
getLocalRegion().getCancelCriterion().checkCancelInProgress(null);
synchronized (suspendLock) {
@@ -227,7 +227,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
} // for
}
- protected final boolean expire(boolean isPending) throws CacheException {
+ protected boolean expire(boolean isPending) throws CacheException {
ExpirationAction action = getAction();
if (action == null)
return false;
@@ -268,12 +268,12 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
return action != null && (action.isInvalidate() || action.isDestroy());
}
- final LocalRegion getLocalRegion() {
+ LocalRegion getLocalRegion() {
return this.region;
}
- protected final boolean expire(ExpirationAction action, boolean isPending) throws CacheException {
+ protected boolean expire(ExpirationAction action, boolean isPending) throws CacheException {
if (action.isInvalidate())
return invalidate();
if (action.isDestroy())
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
index bae061e..1cc7eeb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
@@ -53,7 +53,7 @@ public class FunctionStreamingOrderedReplyMessage extends FunctionStreamingReply
return FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE;
}
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.SERIAL_EXECUTOR;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
index 03c14ab..8d28a53 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java
@@ -379,7 +379,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
/**
* Basic idea is to base id off of host and port of GridProfile
*/
- public static final class GridProfileId implements ProfileId {
+ public static class GridProfileId implements ProfileId {
private final GridProfile gp;
@@ -387,15 +387,15 @@ public abstract class GridAdvisor extends DistributionAdvisor {
this.gp = gp;
}
- public final InternalDistributedMember getMemberId() {
+ public InternalDistributedMember getMemberId() {
return this.gp.getDistributedMember();
}
- public final String getHost() {
+ public String getHost() {
return this.gp.getHost();
}
- public final int getPort() {
+ public int getPort() {
return this.gp.getPort();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 f80f971..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
@@ -54,7 +54,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
* @since GemFire 4.3
*
*/
-public final class HARegion extends DistributedRegion {
+public class HARegion extends DistributedRegion {
private static final Logger logger = LogService.getLogger();
CachePerfStats haRegionStats;
@@ -211,7 +211,7 @@ public final class HARegion extends DistributedRegion {
}
@Override
- public final Object put(Object key, Object value, Object aCallbackArgument)
+ public Object put(Object key, Object value, Object aCallbackArgument)
throws TimeoutException, CacheWriterException {
checkReadiness();
@@ -291,7 +291,7 @@ public final class HARegion extends DistributedRegion {
}
@Override
- final protected boolean shouldNotifyBridgeClients() {
+ protected boolean shouldNotifyBridgeClients() {
return false;
}
@@ -323,7 +323,7 @@ public final class HARegion extends DistributedRegion {
* Never genearte EventID for any Entry or Region operation on the HARegion
*/
@Override
- final public boolean generateEventID() {
+ public boolean generateEventID() {
return false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index d6dc98f..fb5f0cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -1454,8 +1454,7 @@ public class InitialImageOperation {
/**
* This is the message that initiates a request for an image
*/
- public static final class RequestImageMessage extends DistributionMessage
- implements MessageWithReply {
+ public static class RequestImageMessage extends DistributionMessage implements MessageWithReply {
/**
* a version vector is transmitted with the request if we are merely synchronizing with an
@@ -2142,7 +2141,7 @@ public class InitialImageOperation {
/**
* This is the message thats sent to get Filter information.
*/
- public static final class RequestFilterInfoMessage extends DistributionMessage
+ public static class RequestFilterInfoMessage extends DistributionMessage
implements MessageWithReply {
/**
@@ -2409,8 +2408,7 @@ public class InitialImageOperation {
/**
* This is the message thats sent to get RVV from GII provider.
*/
- public static final class RequestRVVMessage extends DistributionMessage
- implements MessageWithReply {
+ public static class RequestRVVMessage extends DistributionMessage implements MessageWithReply {
/**
* Name of the region.
@@ -2540,7 +2538,7 @@ public class InitialImageOperation {
/**
* This is the message thats sent to get RVV from GII provider.
*/
- public static final class RequestSyncMessage extends HighPriorityDistributionMessage {
+ public static class RequestSyncMessage extends HighPriorityDistributionMessage {
/**
* Name of the region.
@@ -2633,7 +2631,7 @@ public class InitialImageOperation {
}
- public static final class ImageReplyMessage extends ReplyMessage {
+ public static class ImageReplyMessage extends ReplyMessage {
/** the next entries in this chunk. Null means abort. */
protected List entries;
@@ -2857,7 +2855,7 @@ public class InitialImageOperation {
/**
* Represents a key/value pair returned from a peer as part of an {@link InitialImageOperation}
*/
- public static final class Entry implements DataSerializableFixedID {
+ public static class Entry implements DataSerializableFixedID {
/**
* key for this entry. Null if "end of chunk" marker entry
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
index f86c92c..ce44f1f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java
@@ -33,7 +33,7 @@ public class InlineKeyHelper {
* Given the number of longs used to encode the inline string return the maximum number of
* characters that can be encoded into that many longs.
*/
- public static final int getMaxInlineStringKey(int longCount, boolean byteEncoded) {
+ public static int getMaxInlineStringKey(int longCount, boolean byteEncoded) {
return (longCount * (byteEncoded ? 8 : 4)) - 1;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
index ba9d1d8..58d1780 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
*
* @since GemFire 4.2.3
*/
-public final class InternalRegionArguments {
+public class InternalRegionArguments {
private boolean isUsedForPartitionedRegionAdmin;
private boolean isUsedForSerialGatewaySenderQueue;
private boolean isUsedForParallelGatewaySenderQueue;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
index eceb194..30edda4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java
@@ -159,7 +159,7 @@ public class InvalidateOperation extends DistributedCacheOperation {
}
}
- public static final class InvalidateWithContextMessage extends InvalidateMessage {
+ public static class InvalidateWithContextMessage extends InvalidateMessage {
transient ClientProxyMembershipID context;
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
index 24fedb6..9339456 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
@@ -55,7 +55,7 @@ public class InvalidateRegionOperation extends DistributedCacheOperation {
return false;
}
- public static final class InvalidateRegionMessage extends CacheOperationMessage {
+ public static class InvalidateRegionMessage extends CacheOperationMessage {
protected EventID eventID;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
index 13edb33..aa7671e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
@@ -64,11 +64,11 @@ public class KeyInfo {
this.key = keyInfo.key;
}
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
- public final Object getCallbackArg() {
+ public Object getCallbackArg() {
return this.callbackArg;
}
@@ -77,19 +77,19 @@ public class KeyInfo {
return this.value;
}
- public final int getBucketId() {
+ public int getBucketId() {
return this.bucketId;
}
- public final void setKey(Object key) {
+ public void setKey(Object key) {
this.key = key;
}
- public final void setBucketId(int bucketId) {
+ public void setBucketId(int bucketId) {
this.bucketId = bucketId;
}
- public final void setCallbackArg(Object callbackArg) {
+ public void setCallbackArg(Object callbackArg) {
this.callbackArg = callbackArg;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp
index 596e031..cb3ce3b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp
@@ -246,7 +246,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
#else
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@Override
@@ -263,7 +263,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
protected void setEntryHash(int v) {
@@ -272,13 +272,13 @@ public class LEAF_CLASS extends PARENT_CLASS {
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
#ifdef DISK
@@ -302,7 +302,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
}
}
@Override
- public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
+ public synchronized int updateAsyncEntrySize(EnableLRU capacityController) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize( getKeyForSizing(), null);
setEntrySize(newSize);
@@ -398,43 +398,37 @@ public class LEAF_CLASS extends PARENT_CLASS {
// nothing needed for LRUs with no disk
#endif
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController,
+ public synchronized int updateEntrySize(EnableLRU capacityController,
Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize( getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
@@ -443,35 +437,27 @@ public class LEAF_CLASS extends PARENT_CLASS {
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode( LRUClockNode next ) {
+ public void setNextLRUNode( LRUClockNode next ) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode( LRUClockNode prev ) {
+ public void setPrevLRUNode( LRUClockNode prev ) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
-//@Override
-//public StringBuilder appendFieldsToString(final StringBuilder sb) {
-// StringBuilder result = super.appendFieldsToString(sb);
-// result.append("; prev=").append(this.prevLRU==null?"null":"not null");
-// result.append("; next=").append(this.nextLRU==null?"null":"not null");
-// return result;
-//}
-
@Override
public Object getKeyForSizing() {
#ifdef KEY_OBJECT
@@ -489,8 +475,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
// stats code
@Override
- public final void updateStatsForGet(boolean hit, long time)
- {
+ public void updateStatsForGet(boolean hit, long time) {
setLastAccessed(time);
if (hit) {
incrementHitCount();
@@ -499,7 +484,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
}
}
@Override
- protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
+ protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) {
_setLastModified(lastModified);
if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) {
setLastAccessed(lastAccessed);
@@ -515,18 +500,18 @@ public class LEAF_CLASS extends PARENT_CLASS {
= AtomicIntegerFieldUpdater.newUpdater(LEAF_CLASS.class, "missCount");
@Override
- public final long getLastAccessed() throws InternalStatisticsDisabledException {
+ public long getLastAccessed() throws InternalStatisticsDisabledException {
return this.lastAccessed;
}
private void setLastAccessed(long lastAccessed) {
this.lastAccessed = lastAccessed;
}
@Override
- public final long getHitCount() throws InternalStatisticsDisabledException {
+ public long getHitCount() throws InternalStatisticsDisabledException {
return this.hitCount & 0xFFFFFFFFL;
}
@Override
- public final long getMissCount() throws InternalStatisticsDisabledException {
+ public long getMissCount() throws InternalStatisticsDisabledException {
return this.missCount & 0xFFFFFFFFL;
}
private void incrementHitCount() {
@@ -536,7 +521,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
missCountUpdater.incrementAndGet(this);
}
@Override
- public final void resetCounts() throws InternalStatisticsDisabledException {
+ public void resetCounts() throws InternalStatisticsDisabledException {
hitCountUpdater.set(this,0);
missCountUpdater.set(this,0);
}
@@ -544,7 +529,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
- public final void txDidDestroy(long currTime) {
+ public void txDidDestroy(long currTime) {
setLastModified(currTime);
setLastAccessed(currTime);
this.hitCount = 0;
@@ -662,14 +647,14 @@ public class LEAF_CLASS extends PARENT_CLASS {
#ifdef KEY_OBJECT
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
#elif defined(KEY_INT)
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@Override
@@ -683,7 +668,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
#elif defined(KEY_LONG)
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@Override
@@ -698,7 +683,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@Override
@@ -722,7 +707,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
return (int) (this.bits1 >> 6) & 0x03;
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -788,7 +773,7 @@ public class LEAF_CLASS extends PARENT_CLASS {
return (int) (this.bits1 >> 6) & 0x03;
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 2985fdb..8e7ec68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -2496,7 +2496,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
releaseLatch(this.initializationLatchBeforeGetInitialImage);
}
- final void releaseAfterGetInitialImageLatch() {
+ void releaseAfterGetInitialImageLatch() {
if (logger.isDebugEnabled()) {
logger.debug("Releasing Initialization Latch (after initial image) for {}", getFullPath());
}
@@ -5562,7 +5562,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
* @return false if ifNew is true and there is an existing key, or ifOld is true and there is no
* existing entry; otherwise return true.
*/
- final boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld,
+ boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld,
final long lastModified, final boolean overwriteDestroyed)
throws TimeoutException, CacheWriterException {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
index e2b5f1c..8062d26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java
@@ -38,7 +38,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
* advertising that it never should receive a request to rebalance.
*
*/
-public final class Node extends ExternalizableDSFID {
+public class Node extends ExternalizableDSFID {
private InternalDistributedMember memberId;
public static final int NONE = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
index bfcf6ff..805b900 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java
@@ -203,12 +203,12 @@ public class NonLocalRegionEntry implements RegionEntry, VersionStamp {
return this.key;
}
- public final Object getValue(RegionEntryContext context) {
+ public Object getValue(RegionEntryContext context) {
return this.value;
}
@Override
- public final Object getValueRetain(RegionEntryContext context) {
+ public Object getValueRetain(RegionEntryContext context) {
return this.value;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
index ff36a57..4137af4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java
@@ -23,7 +23,7 @@ package org.apache.geode.internal.cache;
*
* @since GemFire 6.6
*/
-public final class OpType {
+public class OpType {
private OpType() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
index c6e918e..4074221 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java
@@ -57,7 +57,7 @@ public class OverflowOplogSet implements OplogSet {
}
@Override
- public final void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) {
+ public void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) {
DiskRegion dr = lr.getDiskRegion();
synchronized (this.overflowMap) {
if (this.lastOverflowWrite != null) {
@@ -157,11 +157,11 @@ public class OverflowOplogSet implements OplogSet {
return new OverflowOplog(id, this, getDirectories()[idx], minSize);
}
- final void addOverflow(OverflowOplog oo) {
+ void addOverflow(OverflowOplog oo) {
this.overflowMap.put(oo.getOplogId(), oo);
}
- final void removeOverflow(OverflowOplog oo) {
+ void removeOverflow(OverflowOplog oo) {
if (!basicRemoveOverflow(oo)) {
synchronized (this.compactableOverflowMap) {
this.compactableOverflowMap.remove(oo.getOplogId());
@@ -169,7 +169,7 @@ public class OverflowOplogSet implements OplogSet {
}
}
- final boolean basicRemoveOverflow(OverflowOplog oo) {
+ boolean basicRemoveOverflow(OverflowOplog oo) {
if (this.lastOverflowWrite == oo) {
this.lastOverflowWrite = null;
}
@@ -189,7 +189,7 @@ public class OverflowOplogSet implements OplogSet {
}
}
- final private void removeOverflow(DiskRegion dr, DiskEntry entry) {
+ private void removeOverflow(DiskRegion dr, DiskEntry entry) {
// find the overflow oplog that it is currently in and remove the entry from it
DiskId id = entry.getDiskId();
synchronized (id) {
@@ -223,13 +223,13 @@ public class OverflowOplogSet implements OplogSet {
}
}
- public final OverflowOplog getChild(long oplogId) {
+ public OverflowOplog getChild(long oplogId) {
// the oplog id is cast to an integer because the overflow
// map uses integer oplog ids.
return getChild((int) oplogId);
}
- public final OverflowOplog getChild(int oplogId) {
+ public OverflowOplog getChild(int oplogId) {
OverflowOplog result = this.overflowMap.get(oplogId);
if (result == null) {
synchronized (this.compactableOverflowMap) {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
index 0745975..0be8cf1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java
@@ -480,7 +480,7 @@ public class PRQueryProcessor {
/**
* Status token placed in results stream to track completion of query results for a given bucket
*/
- public static final class EndOfBucket implements DataSerializableFixedID {
+ public static class EndOfBucket implements DataSerializableFixedID {
private int bucketId;
@@ -525,7 +525,7 @@ public class PRQueryProcessor {
*
*/
@SuppressWarnings("synthetic-access")
- private final class QueryTask implements Callable {
+ private class QueryTask implements Callable {
private final DefaultQuery query;
private final Object[] parameters;
private final PartitionedRegionDataStore _prDs;
@@ -574,7 +574,7 @@ public class PRQueryProcessor {
* Encapsulates the result for the query on the bucket.
*
*/
- private final class BucketQueryResult {
+ private class BucketQueryResult {
private int _buk;
private Exception _ex = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
index b7f3e0b..7812a3d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java
@@ -387,19 +387,19 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio
return ea;
}
- public final ExpirationAttributes getEntryIdleTimeout() {
+ public ExpirationAttributes getEntryIdleTimeout() {
return entryIdleTimeout;
}
- public final ExpirationAttributes getEntryTimeToLive() {
+ public ExpirationAttributes getEntryTimeToLive() {
return entryTimeToLive;
}
- public final ExpirationAttributes getRegionIdleTimeout() {
+ public ExpirationAttributes getRegionIdleTimeout() {
return regionIdleTimeout;
}
- public final ExpirationAttributes getRegionTimeToLive() {
+ public ExpirationAttributes getRegionTimeToLive() {
return regionTimeToLive;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index bc51650..b171a95 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -2481,7 +2481,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
*
* @return a List of all entries gathered across all buckets in this data store
*/
- public final List getEntries() {
+ public List getEntries() {
final ArrayList al = new ArrayList();
visitEntries(new EntryVisitor() {
@Override
@@ -2503,7 +2503,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
*
* @param validateOnly only perform bucket-to-node validation
*/
- public final void dumpEntries(final boolean validateOnly) {
+ public void dumpEntries(final boolean validateOnly) {
if (logger.isDebugEnabled()) {
logger.debug("[dumpEntries] dumping {}", this);
}
@@ -2519,7 +2519,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
}
}
- public final void dumpBackingMaps() {
+ public void dumpBackingMaps() {
if (logger.isDebugEnabled()) {
logger.debug("Bucket maps in {}\n", this);
}
@@ -2550,7 +2550,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* <i>Test Method</i> Dump all the bucket names in this data store to the logger
*
*/
- public final void dumpBuckets() {
+ public void dumpBuckets() {
final StringBuffer buf = new StringBuffer("Buckets in ").append(this).append("\n");
visitBuckets(new BucketVisitor() {
@Override
@@ -2566,7 +2566,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* <i>Test Method</i> Return the list of all the bucket names in this data store.
*
*/
- public final List getLocalBucketsListTestOnly() {
+ public List getLocalBucketsListTestOnly() {
final List bucketList = new ArrayList();
visitBuckets(new BucketVisitor() {
@Override
@@ -2581,7 +2581,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* <i>Test Method</i> Return the list of all the primary bucket ids in this data store.
*
*/
- public final List getLocalPrimaryBucketsListTestOnly() {
+ public List getLocalPrimaryBucketsListTestOnly() {
final List primaryBucketList = new ArrayList();
visitBuckets(new BucketVisitor() {
@Override
@@ -2600,7 +2600,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* <i>Test Method</i> Return the list of all the non primary bucket ids in this data store.
*
*/
- public final List getLocalNonPrimaryBucketsListTestOnly() {
+ public List getLocalNonPrimaryBucketsListTestOnly() {
final List nonPrimaryBucketList = new ArrayList();
visitBuckets(new BucketVisitor() {
@Override
@@ -2621,7 +2621,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
* @param bucketId the id of the bucket to dump
* @param bucket the Region containing the bucket data
*/
- public final void dumpBucket(int bucketId, final LocalRegion bucket) {
+ public void dumpBucket(int bucketId, final LocalRegion bucket) {
Integer buckId = Integer.valueOf(bucketId);
visitBucket(buckId, bucket, new EntryVisitor() {
final StringBuffer buf = new StringBuffer("Entries in bucket ").append(bucket).append("\n");
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
index 19cb3f2..d1dc1be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
@@ -738,7 +738,7 @@ public class PartitionedRegionStats {
// messaging stats
// ------------------------------------------------------------------------
- public final long startPartitionMessageProcessing() {
+ public long startPartitionMessageProcessing() {
this.stats.incInt(partitionMessagesReceivedId, 1);
return startTime();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 036c740..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
@@ -92,7 +92,7 @@ public class PersistentOplogSet implements OplogSet {
/**
* returns the active child
*/
- public final Oplog getChild() {
+ public Oplog getChild() {
return this.child;
}
@@ -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) {
@@ -547,7 +547,7 @@ public class PersistentOplogSet implements OplogSet {
}
}
- private final void initOplogEntryId() {
+ private void initOplogEntryId() {
this.oplogEntryId.set(DiskStoreImpl.INVALID_ID);
}
@@ -555,7 +555,7 @@ public class PersistentOplogSet implements OplogSet {
* Sets the last created oplogEntryId to the given value if and only if the given value is greater
* than the current last created oplogEntryId
*/
- private final void updateOplogEntryId(long v) {
+ private void updateOplogEntryId(long v) {
long curVal;
do {
curVal = this.oplogEntryId.get();
@@ -569,7 +569,7 @@ public class PersistentOplogSet implements OplogSet {
/**
* Returns the last created oplogEntryId. Returns INVALID_ID if no oplogEntryId has been created.
*/
- final long getOplogEntryId() {
+ long getOplogEntryId() {
parent.initializeIfNeeded();
return this.oplogEntryId.get();
}
@@ -581,7 +581,7 @@ public class PersistentOplogSet implements OplogSet {
*
* @return A disk id that can be used to access this key/value pair on disk
*/
- final long newOplogEntryId() {
+ long newOplogEntryId() {
long result = this.oplogEntryId.incrementAndGet();
return result;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
index 37a0fe2..02860e6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java
@@ -198,39 +198,39 @@ public class PoolStats {
return DistributionStats.getStatTime();
}
- public final void setInitialContacts(int ic) {
+ public void setInitialContacts(int ic) {
this._stats.setInt(_INITIAL_CONTACTS, ic);
}
- public final void setServerCount(int sc) {
+ public void setServerCount(int sc) {
this._stats.setInt(_ENDPOINTS_KNOWN, sc);
}
- public final void setSubscriptionCount(int qc) {
+ public void setSubscriptionCount(int qc) {
this._stats.setInt(_SUBSCRIPTION_SERVERS, qc);
}
- public final void setLocatorCount(int lc) {
+ public void setLocatorCount(int lc) {
this._stats.setInt(_KNOWN_LOCATORS, lc);
}
- public final long getLocatorRequests() {
+ public long getLocatorRequests() {
return this._stats.getLong(_REQUESTS_TO_LOCATOR);
}
- public final void incLocatorRequests() {
+ public void incLocatorRequests() {
this._stats.incLong(_REQUESTS_TO_LOCATOR, 1);
}
- public final void incLocatorResponses() {
+ public void incLocatorResponses() {
this._stats.incLong(_RESPONSES_FROM_LOCATOR, 1);
}
- public final void setLocatorRequests(long rl) {
+ public void setLocatorRequests(long rl) {
this._stats.setLong(_REQUESTS_TO_LOCATOR, rl);
}
- public final void setLocatorResponses(long rl) {
+ public void setLocatorResponses(long rl) {
this._stats.setLong(_RESPONSES_FROM_LOCATOR, rl);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
index 428c982..c5ccd5b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.lang.StringUtils;
* @since GemFire 5.0.2
*
*/
-public final class PreferBytesCachedDeserializable
+public class PreferBytesCachedDeserializable
implements CachedDeserializable, DataSerializableFixedID {
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
index 9d4b5e2..cfc9fdd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -57,7 +57,7 @@ import org.apache.geode.internal.logging.LogService;
*
* @since GemFire 5.1
*/
-public final class ProxyBucketRegion implements Bucket {
+public class ProxyBucketRegion implements Bucket {
private static final Logger logger = LogService.getLogger();
private final int serialNumber;
@@ -356,11 +356,11 @@ public final class ProxyBucketRegion implements Bucket {
return this.advisor.getBucketRedundancy() + 1;
}
- public final int getBucketId() {
+ public int getBucketId() {
return this.bid;
}
- public final int getId() {
+ public int getId() {
return getBucketId();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
index efa580b..fedafc8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java
@@ -365,7 +365,7 @@ class ProxyRegionMap implements RegionMap {
}
@Override
- public final boolean lruLimitExceeded(DiskRegionView drv) {
+ public boolean lruLimitExceeded(DiskRegionView drv) {
return false;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
index 1d334bc..065d966 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
@@ -49,32 +49,32 @@ abstract class RegionExpiryTask extends ExpiryTask {
}
@Override
- protected final long getLastAccessedTime() {
+ protected long getLastAccessedTime() {
return getLocalRegion().getLastAccessedTime();
}
@Override
- protected final long getLastModifiedTime() {
+ protected long getLastModifiedTime() {
return getLocalRegion().getLastModifiedTime();
}
@Override
- protected final boolean destroy(boolean isPending) throws CacheException {
+ protected boolean destroy(boolean isPending) throws CacheException {
return getLocalRegion().expireRegion(this, true, true);
}
@Override
- protected final boolean invalidate() throws TimeoutException {
+ protected boolean invalidate() throws TimeoutException {
return getLocalRegion().expireRegion(this, true, false);
}
@Override
- protected final boolean localDestroy() throws CacheException {
+ protected boolean localDestroy() throws CacheException {
return getLocalRegion().expireRegion(this, false, true);
}
@Override
- protected final boolean localInvalidate() {
+ protected boolean localInvalidate() {
return getLocalRegion().expireRegion(this, false, false);
}
@@ -85,7 +85,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
}
@Override
- protected final void performTimeout() throws CacheException {
+ protected void performTimeout() throws CacheException {
if (isCanceled) {
return;
}
@@ -93,7 +93,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
}
@Override
- protected final void basicPerformTimeout(boolean isPending) throws CacheException {
+ protected void basicPerformTimeout(boolean isPending) throws CacheException {
if (isCanceled) {
return;
}
@@ -110,7 +110,7 @@ abstract class RegionExpiryTask extends ExpiryTask {
}
@Override
- final protected void reschedule() throws CacheException {
+ protected void reschedule() throws CacheException {
if (isCacheClosing() || getLocalRegion().isClosed() || getLocalRegion().isDestroyed()
|| !isExpirationAllowed()) {
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
index c54da7f..dfc59cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
@@ -58,7 +58,7 @@ class RegionIdleExpiryTask extends RegionExpiryTask {
}
@Override
- protected final void addExpiryTask() {
+ protected void addExpiryTask() {
getLocalRegion().addIdleExpiryTask(this);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
index a59b391..96490e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
@@ -60,7 +60,7 @@ class RegionTTLExpiryTask extends RegionExpiryTask {
}
@Override
- protected final void addExpiryTask() {
+ protected void addExpiryTask() {
getLocalRegion().addTTLExpiryTask(this);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
index debdfd2..49f3d6c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java
@@ -45,7 +45,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 6.5
*/
-public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply {
+public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private boolean valueCheck;
@@ -164,7 +164,7 @@ public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageW
return flags;
}
- public static final class RemoteContainsKeyValueReplyMessage extends ReplyMessage {
+ public static class RemoteContainsKeyValueReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private boolean containsKeyValue;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
index 0a55664..081044e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java
@@ -173,11 +173,11 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
this.oldValBytes = valBytes;
}
- private final void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) {
+ private void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) {
this.oldValObj = o;
}
- public final byte[] getOldValueBytes() {
+ public byte[] getOldValueBytes() {
return this.oldValBytes;
}
@@ -523,19 +523,19 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
buff.append("; hasOldValue= ").append(this.hasOldValue);
}
- protected final Object getKey() {
+ protected Object getKey() {
return this.key;
}
- private final void setKey(Object key) {
+ private void setKey(Object key) {
this.key = key;
}
- public final Operation getOperation() {
+ public Operation getOperation() {
return this.op;
}
- protected final Object getCallbackArg() {
+ protected Object getCallbackArg() {
return this.cbArg;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
index ea26745..913836a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java
@@ -53,7 +53,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 5.1
*/
-public final class RemoteFetchEntryMessage extends RemoteOperationMessage {
+public class RemoteFetchEntryMessage extends RemoteOperationMessage {
private static final Logger logger = LogService.getLogger();
private Object key;
@@ -172,7 +172,7 @@ public final class RemoteFetchEntryMessage extends RemoteOperationMessage {
*
* @since GemFire 5.0
*/
- public static final class FetchEntryReplyMessage extends ReplyMessage {
+ public static class FetchEntryReplyMessage extends ReplyMessage {
/** Propagated exception from remote node to operation initiator */
private EntrySnapshot value;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
index f0ef305..e2125ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java
@@ -47,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 7.0
*/
-public final class RemoteFetchVersionMessage extends RemoteOperationMessage {
+public class RemoteFetchVersionMessage extends RemoteOperationMessage {
private static final Logger logger = LogService.getLogger();
@@ -144,7 +144,7 @@ public final class RemoteFetchVersionMessage extends RemoteOperationMessage {
* This message is used to send a reply for RemoteFetchVersionMessage.
*
*/
- public static final class FetchVersionReplyMessage extends ReplyMessage {
+ public static class FetchVersionReplyMessage extends ReplyMessage {
private VersionTag tag;
/** for deserialization */
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 927697b..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
@@ -57,7 +57,7 @@ import org.apache.geode.internal.util.BlobHelper;
*
* @since GemFire 6.5
*/
-public final class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
+public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private Object key;
@@ -83,7 +83,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
}
@Override
- final public int getProcessorType() {
+ public int getProcessorType() {
return DistributionManager.SERIAL_EXECUTOR;
}
@@ -94,8 +94,8 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
}
@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());
}
@@ -214,7 +214,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
*
* @since GemFire 6.5
*/
- public static final class GetReplyMessage extends ReplyMessage {
+ public static class GetReplyMessage extends ReplyMessage {
/**
* The raw value in the cache which may be serialized to the output stream, if it is NOT already
* a byte array
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
index 1af51e8..eea654d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java
@@ -54,7 +54,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES;
import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT;
-public final class RemoteInvalidateMessage extends RemoteDestroyMessage {
+public class RemoteInvalidateMessage extends RemoteDestroyMessage {
private static final Logger logger = LogService.getLogger();
@@ -261,7 +261,7 @@ public final class RemoteInvalidateMessage extends RemoteDestroyMessage {
}
- public static final class InvalidateReplyMessage extends ReplyMessage {
+ public static class InvalidateReplyMessage extends ReplyMessage {
private VersionTag versionTag;
private static final byte HAS_VERSION = 0x01;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 dc0f25c..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
@@ -65,7 +65,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
*
* @since GemFire 6.5
*/
-public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
+public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private PutAllEntryData[] putAllData;
@@ -261,7 +261,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
}
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
super.toData(out);
DataSerializer.writeObject(this.eventId, out);
DataSerializer.writeObject(this.callbackArg, out);
@@ -344,9 +344,8 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
* lastModified timestamp for last modification
* @return If succeeds, return true, otherwise, throw exception
*/
- public final 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
@@ -427,7 +426,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
@Override
- protected final void appendFields(StringBuffer buff) {
+ protected void appendFields(StringBuffer buff) {
super.appendFields(buff);
buff.append("; putAllDataCount=").append(putAllDataCount);
if (this.bridgeContext != null) {
@@ -439,7 +438,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR
}
}
- public static final class PutAllReplyMessage extends ReplyMessage {
+ public static class PutAllReplyMessage extends ReplyMessage {
/** Result of the PutAll operation */
// private PutAllResponseData[] responseData;
private VersionedObjectList versions;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
index acf77ba..4135752 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java
@@ -66,7 +66,7 @@ import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.EN
*
* @since GemFire 6.5
*/
-public final class RemotePutMessage extends RemoteOperationMessageWithDirectReply
+public class RemotePutMessage extends RemoteOperationMessageWithDirectReply
implements NewValueImporter, OldValueImporter {
private static final Logger logger = LogService.getLogger();
@@ -412,30 +412,30 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
return processor;
}
- // public final boolean needsDirectAck()
+ // public boolean needsDirectAck()
// {
// return this.directAck;
// }
- // final public int getProcessorType() {
+ // public int getProcessorType() {
// return DistributionManager.PARTITIONED_REGION_EXECUTOR;
// }
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
- public final void setKey(Object key) {
+ public void setKey(Object key) {
this.key = key;
}
- public final byte[] getValBytes() {
+ public byte[] getValBytes() {
return this.valBytes;
}
- public final byte[] getOldValueBytes() {
+ public byte[] getOldValueBytes() {
return this.oldValBytes;
}
@@ -460,16 +460,16 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
this.oldValObj = o;
}
- public final Object getCallbackArg() {
+ public Object getCallbackArg() {
return this.cbArg;
}
- protected final Operation getOperation() {
+ protected Operation getOperation() {
return this.op;
}
@Override
- public final void setOperation(Operation operation) {
+ public void setOperation(Operation operation) {
this.op = operation;
}
@@ -486,7 +486,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
}
@Override
- public final void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
setKey(DataSerializer.readObject(in));
@@ -544,7 +544,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
}
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
this.hasDelta = false;
super.toData(out);
DataSerializer.writeObject(getKey(), out);
@@ -616,7 +616,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
* indefinitely for the acknowledgement
*/
@Override
- protected final boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
+ protected boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime)
throws EntryExistsException, RemoteOperationException {
this.setInternalDs(r.getSystem());// set the internal DS. Required to
// checked DS level delta-enabled property
@@ -733,7 +733,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
}
@Override
- protected final void appendFields(StringBuffer buff) {
+ protected void appendFields(StringBuffer buff) {
super.appendFields(buff);
buff.append("; key=").append(getKey()).append("; value=");
// buff.append(getValBytes());
@@ -768,15 +768,15 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
buff.append(this.applyDeltaBytes);
}
- public final InternalDistributedSystem getInternalDs() {
+ public InternalDistributedSystem getInternalDs() {
return internalDs;
}
- public final void setInternalDs(InternalDistributedSystem internalDs) {
+ public void setInternalDs(InternalDistributedSystem internalDs) {
this.internalDs = internalDs;
}
- public static final class PutReplyMessage extends ReplyMessage implements OldValueImporter {
+ public static class PutReplyMessage extends ReplyMessage implements OldValueImporter {
static final byte FLAG_RESULT = 0x01;
static final byte FLAG_HASVERSION = 0x02;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
index 4755fcf..b998fdf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
*
* @since GemFire 7.0
*/
-public final class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply {
+public class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private enum Operation {
@@ -135,7 +135,7 @@ public final class RemoteRegionOperation extends RemoteOperationMessageWithDirec
out.writeByte(this.op.ordinal());
}
- public static final class RemoteRegionOperationReplyMessage extends ReplyMessage {
+ public static class RemoteRegionOperationReplyMessage extends ReplyMessage {
/**
* Empty constructor to conform to DataSerializable interface
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/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 d30e8c1..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
@@ -65,7 +65,7 @@ import org.apache.geode.internal.offheap.annotations.Released;
*
* @since GemFire 8.1
*/
-public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectReply {
+public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectReply {
private static final Logger logger = LogService.getLogger();
private RemoveAllEntryData[] removeAllData;
@@ -253,7 +253,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
}
@Override
- public final void toData(DataOutput out) throws IOException {
+ public void toData(DataOutput out) throws IOException {
super.toData(out);
DataSerializer.writeObject(this.eventId, out);
DataSerializer.writeObject(this.callbackArg, out);
@@ -333,8 +333,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
* @param eventSender the endpoint server who received request from client
* @return If succeeds, return true, otherwise, throw exception
*/
- public final 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;
@@ -417,7 +416,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
@Override
- protected final void appendFields(StringBuffer buff) {
+ protected void appendFields(StringBuffer buff) {
super.appendFields(buff);
buff.append("; removeAllDataCount=").append(removeAllDataCount);
if (this.bridgeContext != null) {
@@ -429,7 +428,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire
}
}
- public static final class RemoveAllReplyMessage extends ReplyMessage {
+ public static class RemoveAllReplyMessage extends ReplyMessage {
/** Result of the RemoveAll operation */
private VersionedObjectList versions;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
index 9b2c5b1..bb015bf 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java
@@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.InternalRole;
*
* @since GemFire 5.0
*/
-public final class RoleEventImpl extends RegionEventImpl implements RoleEvent, DataSerializable {
+public class RoleEventImpl extends RegionEventImpl implements RoleEvent, DataSerializable {
private static final long serialVersionUID = 1306615015229258945L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
index 34f6b73..4e30a34 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
@@ -1346,7 +1346,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
* A QueryMessage is broadcast to every node that has the region defined, to find out who has a
* valid copy of the requested object.
*/
- public static final class QueryMessage extends SerialDistributionMessage {
+ public static class QueryMessage extends SerialDistributionMessage {
/**
* The object id of the processor object on the initiator node. This will be communicated back
@@ -1593,7 +1593,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
* The ResponseMessage is a reply to a QueryMessage, and contains the object's value, if it is
* below the byte limit, otherwise an indication of whether the sender has the value.
*/
- public static final class ResponseMessage extends HighPriorityDistributionMessage {
+ public static class ResponseMessage extends HighPriorityDistributionMessage {
private Object key;
@@ -1722,7 +1722,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
/********************* NetSearchRequestMessage ***************************************/
- public static final class NetSearchRequestMessage extends PooledDistributionMessage {
+ public static class NetSearchRequestMessage extends PooledDistributionMessage {
/**
* The object id of the processor object on the initiator node. This will be communicated back
@@ -1949,7 +1949,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
* The NetSearchReplyMessage is a reply to a NetSearchRequestMessage, and contains the object's
* value.
*/
- public static final class NetSearchReplyMessage extends HighPriorityDistributionMessage {
+ public static class NetSearchReplyMessage extends HighPriorityDistributionMessage {
private static final byte SERIALIZED = 0x01;
private static final byte REQUESTOR_TIMEOUT = 0x02;
private static final byte AUTHORATIVE = 0x04;
@@ -2105,7 +2105,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
/******************************** NetLoadRequestMessage **********************/
- public static final class NetLoadRequestMessage extends PooledDistributionMessage {
+ public static class NetLoadRequestMessage extends PooledDistributionMessage {
/**
* The object id of the processor object on the initiator node. This will be communicated back
@@ -2282,7 +2282,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
/**
* The NetLoadReplyMessage is a reply to a RequestMessage, and contains the object's value.
*/
- public static final class NetLoadReplyMessage extends HighPriorityDistributionMessage {
+ public static class NetLoadReplyMessage extends HighPriorityDistributionMessage {
/** The gemfire id of the SearchLoadAndWrite object waiting for response */
private int processorId;
@@ -2386,7 +2386,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
/********************* NetWriteRequestMessage *******************************/
- public static final class NetWriteRequestMessage extends PooledDistributionMessage {
+ public static class NetWriteRequestMessage extends PooledDistributionMessage {
/**
* The object id of the processor object on the initiator node. This will be communicated back
@@ -2587,7 +2587,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
* The NetWriteReplyMessage is a reply to a NetWriteRequestMessage, and contains the success code
* or exception that is propagated back to the requestor
*/
- public static final class NetWriteReplyMessage extends HighPriorityDistributionMessage {
+ public static class NetWriteReplyMessage extends HighPriorityDistributionMessage {
/** The gemfire id of the SearchLoadAndWrite object waiting for response */
private int processorId;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
index a8f1edc..3ad1137 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
@@ -272,8 +272,7 @@ public class StateFlushOperation {
* @see StateFlushOperation.StateStabilizedMessage
*
*/
- public static final class StateMarkerMessage extends DistributionMessage
- implements MessageWithReply {
+ public static class StateMarkerMessage extends DistributionMessage implements MessageWithReply {
/** roll the membership version to force flushing of new ops */
public boolean flushNewOps;
/** the member acting as the relay point */
@@ -525,7 +524,7 @@ public class StateFlushOperation {
* @see StateFlushOperation.StateMarkerMessage
* @since GemFire 5.0.1
*/
- public static final class StateStabilizationMessage extends SerialDistributionMessage {
+ public static class StateStabilizationMessage extends SerialDistributionMessage {
/** the member that requested StateStabilizedMessages */
protected DistributedMember requestingMember;
/** the processor id for the requesting member */
@@ -673,7 +672,7 @@ public class StateFlushOperation {
* @since GemFire 5.0.1
*
*/
- public static final class StateStabilizedMessage extends ReplyMessage {
+ public static class StateStabilizedMessage extends ReplyMessage {
/** the member for whom this ack is being sent */
protected DistributedMember sendingMember;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
index d9ef183..43165a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
@@ -212,7 +212,7 @@ public class TXEntry implements Region.Entry {
}
}
- private final TXEntryUserAttrState txReadUA(KeyInfo ki) {
+ private TXEntryUserAttrState txReadUA(KeyInfo ki) {
TXRegionState txr = this.myTX.txReadRegion(this.localRegion);
if (txr != null) {
return txr.readEntryUserAttr(ki.getKey());
@@ -221,7 +221,7 @@ public class TXEntry implements Region.Entry {
}
}
- protected final TXEntryUserAttrState txWriteUA(KeyInfo ki) {
+ protected TXEntryUserAttrState txWriteUA(KeyInfo ki) {
TXRegionState txr = myTX.txWriteRegion(this.localRegion, ki);
if (txr != null) {
return txr.writeEntryUserAttr(ki.getKey(), this.localRegion);
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
index f090ba4..2ee3a8c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java
@@ -434,38 +434,38 @@ public class TXEntryState implements Releasable {
return v;
}
- private final boolean isOpCreate() {
+ private boolean isOpCreate() {
return this.op >= OP_CREATE_LI && this.op <= OP_LOCAL_CREATE;
}
- final boolean isOpCreateEvent() {
+ boolean isOpCreateEvent() {
return isOpCreate();
}
- private final boolean isOpPut() {
+ private boolean isOpPut() {
return this.op >= OP_PUT;
}
- protected final boolean isOpPutEvent() {
+ protected boolean isOpPutEvent() {
return isOpPut();
}
- private final boolean isOpInvalidate() {
+ private boolean isOpInvalidate() {
// Note that OP_CREATE_LI, OP_LLOAD_CREATE_LI, and OP_NLOAD_CREATE_LI
// do not return true here because they are actually creates
// with a value of LOCAL_INVALID locally and some other value remotely.
return this.op <= OP_D_INVALIDATE && this.op >= OP_L_INVALIDATE;
}
- final boolean isOpInvalidateEvent() {
+ boolean isOpInvalidateEvent() {
return isOpInvalidate();
}
- private final boolean isOpDestroy() {
+ private boolean isOpDestroy() {
return this.op <= OP_D_DESTROY && this.op >= OP_L_DESTROY;
}
- final boolean isOpDestroyEvent(LocalRegion r) {
+ boolean isOpDestroyEvent(LocalRegion r) {
// Note that if the region is a proxy then we go ahead and distributed
// the destroy because we can't eliminate it based on committed state
return isOpDestroy()
@@ -477,31 +477,31 @@ public class TXEntryState implements Releasable {
*
* @since GemFire 5.0
*/
- final boolean isOpAnyEvent(LocalRegion r) {
+ boolean isOpAnyEvent(LocalRegion r) {
return isOpPutEvent() || isOpCreateEvent() || isOpInvalidateEvent() || isOpDestroyEvent(r);
}
- final boolean isOpSearchOrLoad() {
+ boolean isOpSearchOrLoad() {
return this.op >= OP_SEARCH_CREATE && this.op != OP_PUT && this.op != OP_LOCAL_CREATE;
}
- final boolean isOpSearch() {
+ boolean isOpSearch() {
return this.op == OP_SEARCH_CREATE || this.op == OP_SEARCH_PUT;
}
- final boolean isOpLocalLoad() {
+ boolean isOpLocalLoad() {
return this.op == OP_LLOAD_CREATE || this.op == OP_LLOAD_PUT;
}
- final boolean isOpNetLoad() {
+ boolean isOpNetLoad() {
return this.op == OP_NLOAD_CREATE || this.op == OP_NLOAD_PUT;
}
- final boolean isOpLoad() {
+ boolean isOpLoad() {
return isOpLocalLoad() || isOpNetLoad();
}
- // private final boolean isLocalEventDistributed()
+ // private boolean isLocalEventDistributed()
// {
// return this.op == OP_D_DESTROY
// || (this.op >= OP_D_INVALIDATE && this.op != OP_SEARCH_CREATE
@@ -1490,11 +1490,11 @@ public class TXEntryState implements Releasable {
return "<" + StringUtils.forceToString(o) + ">";
}
- private final boolean didDestroy() {
+ private boolean didDestroy() {
return this.destroy != DESTROY_NONE;
}
- private final boolean didDistributedDestroy() {
+ private boolean didDistributedDestroy() {
return this.destroy == DESTROY_DISTRIBUTED;
}
@@ -1553,7 +1553,7 @@ public class TXEntryState implements Releasable {
return isOpCreate();
}
- private final void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) {
+ private void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) {
boolean invokeCallbacks = isOpDestroyEvent(r);
List<EntryEventImpl> pendingCallbacks =
invokeCallbacks ? txState.getPendingCallbacks() : new ArrayList<EntryEventImpl>();
@@ -1571,7 +1571,7 @@ public class TXEntryState implements Releasable {
// transaction listener that no destroy was done.
}
- private final void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue,
+ private void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue,
boolean didDestroy, TXState txState) {
try {
r.txApplyInvalidate(key, newValue, didDestroy, txState.getTransactionId(), null,
@@ -1583,7 +1583,7 @@ public class TXEntryState implements Releasable {
}
}
- private final void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue,
+ private void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue,
boolean didDestroy, TXState txState) {
try {
r.txApplyPut(putOp, key, newValue, didDestroy, txState.getTransactionId(), null,
@@ -1929,7 +1929,7 @@ public class TXEntryState implements Releasable {
*
* @since GemFire 5.0
*/
- public final class TxEntryEventImpl extends EntryEventImpl implements Comparable {
+ public class TxEntryEventImpl extends EntryEventImpl implements Comparable {
/**
* Creates a local tx entry event
*/
[46/69] [abbrv] geode git commit: GEODE-2875 shutdown is taking as
long as 20 seconds
Posted by ud...@apache.org.
GEODE-2875 shutdown is taking as long as 20 seconds
With a 1.2.0 release pending I am backing out the part of the fix for
this issue that routed certain messages over UDP unicast. This change
needs more testing as Hitesh suspects it is implicated in a number of
hangs he has seen in his tests.
The Shutdown message is still routed over UDP but all others are now
directed to TCP/IP stream sockets, as they were before.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/15245dfd
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/15245dfd
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/15245dfd
Branch: refs/heads/feature/GEODE-2580
Commit: 15245dfd2b78a593697e46c8710d288883783fc4
Parents: 0f978a6
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed May 17 13:30:22 2017 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu May 18 08:00:53 2017 -0700
----------------------------------------------------------------------
.../internal/membership/gms/mgr/GMSMembershipManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/15245dfd/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index a41e08a..fe560d9 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -37,6 +37,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.geode.distributed.internal.ShutdownMessage;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
@@ -1866,7 +1867,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
useMcast = (msg.getMulticast() || allDestinations);
}
- boolean sendViaMessenger = isForceUDPCommunications() || msg.sendViaUDP();
+ boolean sendViaMessenger = isForceUDPCommunications() || (msg instanceof ShutdownMessage);
if (useMcast || tcpDisabled || sendViaMessenger) {
checkAddressesForUUIDs(destinations);
[08/69] [abbrv] geode git commit: GEODE-2929: remove superfluous uses
of final from internal classes
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey1.java
index 3903fd7..8f3498c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey1.java
@@ -15,40 +15,64 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRURegionEntryHeap {
public VersionedThinLRURegionEntryHeapStringKey1(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -67,9 +91,11 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -78,10 +104,11 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapStringKey1.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -101,7 +128,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -112,114 +139,118 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -236,6 +267,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -253,6 +285,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -282,6 +315,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -314,8 +348,11 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -329,7 +366,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -348,6 +385,7 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -377,5 +415,8 @@ public class VersionedThinLRURegionEntryHeapStringKey1 extends VersionedThinLRUR
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey2.java
index a0e3e55..939e3dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapStringKey2.java
@@ -15,23 +15,32 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
@@ -39,16 +48,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRURegionEntryHeap {
public VersionedThinLRURegionEntryHeapStringKey2(RegionEntryContext context, String key,
- Object value, boolean byteEncode) {
- super(context, value);
+
+
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -79,9 +103,11 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -90,10 +116,11 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapStringKey2.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -113,7 +140,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -124,114 +151,118 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -248,6 +279,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -265,6 +297,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -294,6 +327,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -326,8 +360,11 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -346,7 +383,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -376,6 +413,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -418,5 +456,7 @@ public class VersionedThinLRURegionEntryHeapStringKey2 extends VersionedThinLRUR
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapUUIDKey.java
index e8bbb05..028926e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryHeapUUIDKey.java
@@ -15,46 +15,73 @@
package org.apache.geode.internal.cache;
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
import java.util.UUID;
+
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+
import org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
+// versioned: 1
// offheap: OFFHEAP
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
-// key uuid: KEY_UUID
+// key uuid: 1
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegionEntryHeap {
public VersionedThinLRURegionEntryHeapUUIDKey(RegionEntryContext context, UUID key,
- Object value) {
- super(context, value);
+
+
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
this.keyMostSigBits = key.getMostSignificantBits();
this.keyLeastSigBits = key.getLeastSignificantBits();
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -63,10 +90,11 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryHeapUUIDKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryHeapUUIDKey.class,
"lastModified");
+
private volatile Object value;
@Override
- protected final Object getValueField() {
+ protected Object getValueField() {
return this.value;
}
@@ -86,7 +114,7 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -97,114 +125,118 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -221,6 +253,7 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -238,6 +271,7 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -267,6 +301,7 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -299,13 +334,16 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long keyMostSigBits;
private final long keyLeastSigBits;
@Override
- public final Object getKey() {
+ public Object getKey() {
return new UUID(this.keyMostSigBits, this.keyLeastSigBits);
}
@@ -318,5 +356,8 @@ public class VersionedThinLRURegionEntryHeapUUIDKey extends VersionedThinLRURegi
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapIntKey.java
index cba309d..560ef62 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapIntKey.java
@@ -15,48 +15,77 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
-// key int: KEY_INT
+// key int: 1
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapIntKey(RegionEntryContext context, int key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -65,6 +94,7 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapIntKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapIntKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -96,13 +126,19 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -118,7 +154,9 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -142,7 +180,7 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -153,114 +191,118 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -277,6 +319,7 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -294,6 +337,7 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -323,6 +367,7 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -355,12 +400,17 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
+
+
private final int key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -371,5 +421,8 @@ public class VersionedThinLRURegionEntryOffHeapIntKey extends VersionedThinLRURe
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapLongKey.java
index 98fb7f7..2b8eba3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapLongKey.java
@@ -15,48 +15,77 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
-// key long: KEY_LONG
+// key long: 1
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
*/
public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapLongKey(RegionEntryContext context, long key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -65,6 +94,7 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapLongKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapLongKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -96,13 +126,19 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -118,7 +154,9 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -142,7 +180,7 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -153,114 +191,118 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -277,6 +319,7 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -294,6 +337,7 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -323,6 +367,7 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -355,12 +400,15 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
@@ -371,5 +419,8 @@ public class VersionedThinLRURegionEntryOffHeapLongKey extends VersionedThinLRUR
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapObjectKey.java
index d7af3c3..a2273a7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapObjectKey.java
@@ -15,35 +15,46 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
-// key object: KEY_OBJECT
+// key object: 1
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,13 +62,31 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinLRURegionEntryOffHeapObjectKey
extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapObjectKey(RegionEntryContext context, Object key,
- @Retained Object value) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
+
+
this.key = key;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -66,6 +95,7 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapObjectKey> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapObjectKey.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -97,13 +127,19 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -119,7 +155,9 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -143,7 +181,7 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -154,114 +192,118 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
// default implementation.
return getKey();
+
+
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -278,6 +320,7 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -295,6 +338,7 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -324,6 +368,7 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -356,13 +401,19 @@ public class VersionedThinLRURegionEntryOffHeapObjectKey
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final Object key;
@Override
- public final Object getKey() {
+ public Object getKey() {
return this.key;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java
index e072a3e..6b1df6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java
@@ -15,35 +15,46 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
-// key string1: KEY_STRING1
+// key string1: 1
// key string2: KEY_STRING2
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,9 +62,23 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinLRURegionEntryOffHeapStringKey1
extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapStringKey1(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
if (byteEncode) {
@@ -72,9 +97,11 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -83,6 +110,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapStringKey1> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapStringKey1.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -114,13 +142,19 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -136,7 +170,9 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -160,7 +196,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -171,114 +207,118 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -295,6 +335,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -312,6 +353,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -341,6 +383,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -373,8 +416,11 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
private final long bits1;
private int getKeyLength() {
@@ -388,7 +434,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -407,6 +453,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -436,5 +483,8 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1
}
return false;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java
index a6c5726..bc533ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java
@@ -15,35 +15,46 @@
package org.apache.geode.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 org.apache.geode.cache.EntryEvent;
+
import org.apache.geode.internal.cache.lru.EnableLRU;
+
import org.apache.geode.internal.cache.lru.LRUClockNode;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
+
import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Retained;
import org.apache.geode.internal.offheap.annotations.Unretained;
+
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
// macros whose definition changes this class:
// disk: DISK
-// lru: LRU
+// lru: 1
// stats: STATS
-// versioned: VERSIONED
-// offheap: OFFHEAP
+// versioned: 1
+// offheap: 1
// One of the following key macros must be defined:
// key object: KEY_OBJECT
// key int: KEY_INT
// key long: KEY_LONG
// key uuid: KEY_UUID
// key string1: KEY_STRING1
-// key string2: KEY_STRING2
+// key string2: 1
+
/**
* Do not modify this class. It was generated. Instead modify LeafRegionEntry.cpp and then run
* ./dev-tools/generateRegionEntryClasses.sh (it must be run from the top level directory).
@@ -51,9 +62,23 @@ import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.Ha
public class VersionedThinLRURegionEntryOffHeapStringKey2
extends VersionedThinLRURegionEntryOffHeap {
public VersionedThinLRURegionEntryOffHeapStringKey2(RegionEntryContext context, String key,
- @Retained Object value, boolean byteEncode) {
- super(context, value);
+
+ @Retained
+
+ Object value
+
+ , boolean byteEncode
+
+ ) {
+ super(context,
+
+
+
+ value
+
+ );
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// caller has already confirmed that key.length <= MAX_INLINE_STRING_KEY
long tmpBits1 = 0L;
long tmpBits2 = 0L;
@@ -84,9 +109,11 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
tmpBits1 |= key.length();
this.bits1 = tmpBits1;
this.bits2 = tmpBits2;
+
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// common code
protected int hash;
private HashEntry<Object, Object> next;
@@ -95,6 +122,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
private static final AtomicLongFieldUpdater<VersionedThinLRURegionEntryOffHeapStringKey2> lastModifiedUpdater =
AtomicLongFieldUpdater.newUpdater(VersionedThinLRURegionEntryOffHeapStringKey2.class,
"lastModified");
+
/**
* All access done using ohAddrUpdater so it is used even though the compiler can not tell it is.
*/
@@ -126,13 +154,19 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
@Override
+
@Unretained
protected void setValueField(@Unretained Object v) {
+
+
+
OffHeapRegionEntryHelper.setValue(this, v);
}
@Override
+
@Retained
+
public Object _getValueRetain(RegionEntryContext context, boolean decompress) {
return OffHeapRegionEntryHelper._getValueRetain(this, decompress, context);
}
@@ -148,7 +182,9 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
@Override
+
@Released
+
public void release() {
OffHeapRegionEntryHelper.releaseEntry(this);
}
@@ -172,7 +208,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getEntryHash()
*/
- public final int getEntryHash() {
+ public int getEntryHash() {
return this.hash;
}
@@ -183,114 +219,118 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
/**
* @see HashEntry#getNextEntry()
*/
- public final HashEntry<Object, Object> getNextEntry() {
+ public HashEntry<Object, Object> getNextEntry() {
return this.next;
}
/**
* @see HashEntry#setNextEntry
*/
- public final void setNextEntry(final HashEntry<Object, Object> n) {
+ public void setNextEntry(final HashEntry<Object, Object> n) {
this.next = n;
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// lru code
@Override
public void setDelayedDiskId(LocalRegion r) {
+
+
+
// nothing needed for LRUs with no disk
+
}
- public final synchronized int updateEntrySize(EnableLRU capacityController) {
+ 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
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- public final synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
+
+ public synchronized int updateEntrySize(EnableLRU capacityController, Object value) {
int oldSize = getEntrySize();
int newSize = capacityController.entrySize(getKeyForSizing(), value);
setEntrySize(newSize);
int delta = newSize - oldSize;
- // if ( debug ) log( "updateEntrySize key=" + getKey()
- // + (_getValue() == Token.INVALID ? " invalid" :
- // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" :
- // (_getValue()==null ? " evicted" : " valid")))
- // + " oldSize=" + oldSize
- // + " newSize=" + this.size );
return delta;
}
- public final boolean testRecentlyUsed() {
+ public boolean testRecentlyUsed() {
return areAnyBitsSet(RECENTLY_USED);
}
@Override
- public final void setRecentlyUsed() {
+ public void setRecentlyUsed() {
setBits(RECENTLY_USED);
}
- public final void unsetRecentlyUsed() {
+ public void unsetRecentlyUsed() {
clearBits(~RECENTLY_USED);
}
- public final boolean testEvicted() {
+ public boolean testEvicted() {
return areAnyBitsSet(EVICTED);
}
- public final void setEvicted() {
+ public void setEvicted() {
setBits(EVICTED);
}
- public final void unsetEvicted() {
+ public void unsetEvicted() {
clearBits(~EVICTED);
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
private LRUClockNode nextLRU;
private LRUClockNode prevLRU;
private int size;
- public final void setNextLRUNode(LRUClockNode next) {
+ public void setNextLRUNode(LRUClockNode next) {
this.nextLRU = next;
}
- public final LRUClockNode nextLRUNode() {
+ public LRUClockNode nextLRUNode() {
return this.nextLRU;
}
- public final void setPrevLRUNode(LRUClockNode prev) {
+ public void setPrevLRUNode(LRUClockNode prev) {
this.prevLRU = prev;
}
- public final LRUClockNode prevLRUNode() {
+ public LRUClockNode prevLRUNode() {
return this.prevLRU;
}
- public final int getEntrySize() {
+ public int getEntrySize() {
return this.size;
}
- protected final void setEntrySize(int size) {
+ protected void setEntrySize(int size) {
this.size = size;
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
- // @Override
- // public StringBuilder appendFieldsToString(final StringBuilder sb) {
- // StringBuilder result = super.appendFieldsToString(sb);
- // result.append("; prev=").append(this.prevLRU==null?"null":"not null");
- // result.append("; next=").append(this.nextLRU==null?"null":"not null");
- // return result;
- // }
+
@Override
public Object getKeyForSizing() {
+
+
+
// inline keys always report null for sizing since the size comes from the entry size
return null;
+
}
+
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// versioned code
private VersionSource memberID;
private short entryVersionLowBytes;
@@ -307,6 +347,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
return (((long) regionVersionHighBytes) << 32) | (regionVersionLowBytes & 0x00000000FFFFFFFFL);
}
+
public long getVersionTimeStamp() {
return getLastModified();
}
@@ -324,6 +365,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public void setVersions(VersionTag tag) {
this.memberID = tag.getMemberID();
int eVersion = tag.getEntryVersion();
@@ -353,6 +395,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
public VersionTag asVersionTag() {
VersionTag tag = VersionTag.create(memberID);
tag.setEntryVersion(getEntryVersion());
@@ -385,8 +428,11 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
return this.regionVersionLowBytes;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
// key code
+
// strlen is encoded in lowest 6 bits (max strlen is 63)
// character encoding info is in bits 7 and 8
// The other bits are used to encoded character data.
@@ -405,7 +451,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
@Override
- public final Object getKey() {
+ public Object getKey() {
int keylen = getKeyLength();
char[] chars = new char[keylen];
long tmpBits1 = this.bits1;
@@ -435,6 +481,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
+
@Override
public boolean isKeyEqual(Object k) {
if (k instanceof String) {
@@ -477,5 +524,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2
}
return false;
}
+
// DO NOT modify this class. It was generated from LeafRegionEntry.cpp
}
+
[54/69] [abbrv] geode git commit: GEODE-1994: Overhaul of
internal.lang.StringUtils to extend and heavily use commons.lang.StringUtils
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
index c35f420..3c368c5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.management.internal.cli.shell;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.internal.util.IOUtils;
+
import java.io.File;
import java.util.logging.Level;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.util.IOUtils;
-
/**
*
* @since GemFire 7.0
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
index 7c80e0d..2b39bed 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java
@@ -16,6 +16,7 @@ package org.apache.geode.management.internal.cli.shell;
import static org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper.execCLISteps;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.CommandProcessingException;
@@ -101,10 +102,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
} catch (NotAuthorizedException e) {
result = ResultBuilder
.createGemFireUnAuthorizedErrorResult("Unauthorized. Reason: " + e.getMessage());
- } catch (JMXInvocationException e) {
- Gfsh.getCurrentInstance().logWarning(e.getMessage(), e);
- } catch (IllegalStateException e) {
- // Shouldn't occur - we are always using GfsParseResult
+ } catch (JMXInvocationException | IllegalStateException e) {
Gfsh.getCurrentInstance().logWarning(e.getMessage(), e);
} catch (CommandProcessingException e) {
Gfsh.getCurrentInstance().logWarning(e.getMessage(), null);
@@ -204,11 +202,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
try {
interceptor = (CliAroundInterceptor) ClassPathLoader.getLatest().forName(interceptorClass)
.newInstance();
- } catch (InstantiationException e) {
- shell.logWarning("Configuration error", e);
- } catch (IllegalAccessException e) {
- shell.logWarning("Configuration error", e);
- } catch (ClassNotFoundException e) {
+ } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
shell.logWarning("Configuration error", e);
}
if (interceptor != null) {
@@ -247,7 +241,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
+ "Please check manager logs for error.");
}
- // the response could be a string which is a json respresentation of the CommandResult object
+ // the response could be a string which is a json representation of the CommandResult object
// it can also be a Path to a temp file downloaded from the rest http request
if (response instanceof String) {
CommandResponse commandResponse =
@@ -259,7 +253,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy {
}
String debugInfo = commandResponse.getDebugInfo();
- if (debugInfo != null && !debugInfo.trim().isEmpty()) {
+ if (StringUtils.isNotBlank(debugInfo)) {
// TODO - Abhishek When debug is ON, log response in gfsh logs
// TODO - Abhishek handle \n better. Is it coming from GemFire formatter
debugInfo = debugInfo.replaceAll("\n\n\n", "\n");
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
index e9d183e..7ae7c3b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
@@ -17,8 +17,8 @@ package org.apache.geode.management.internal.cli.shell;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PREFIX;
import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PREFIX;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.util.ArrayUtils;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.management.DistributedSystemMXBean;
@@ -192,7 +192,7 @@ public class JmxOperationInvoker implements OperationInvoker {
URL gfSecurityPropertiesUrl = null;
// Case 1: User has specified gfSecurity properties file
- if (!StringUtils.isBlank(gfSecurityPropertiesPathToUse)) {
+ if (StringUtils.isNotBlank(gfSecurityPropertiesPathToUse)) {
// User specified gfSecurity properties doesn't exist
if (!IOUtils.isExistingPathname(gfSecurityPropertiesPathToUse)) {
gfshInstance
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
index 4410fea..cfb8a24 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.cli.util;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.management.internal.cli.GfshParser;
@@ -59,7 +59,7 @@ public class CommandStringBuilder {
}
public CommandStringBuilder addOptionWithValueCheck(String option, String value) {
- if (!StringUtils.isBlank(value)) {
+ if (StringUtils.isNotBlank(value)) {
return addOption(option, value);
}
return this;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 0dbe7e5..00902a9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -14,6 +14,25 @@
*/
package org.apache.geode.management.internal.configuration.domain;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.VersionedDataSerializable;
+import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -24,32 +43,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.xpath.XPathExpressionException;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.VersionedDataSerializable;
-import org.apache.logging.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-
/****
* Domain class for defining a GemFire entity in XML.
*
@@ -156,13 +154,13 @@ public class XmlEntity implements VersionedDataSerializable {
StringBuffer sb = new StringBuffer();
sb.append("//").append(this.prefix).append(':').append(this.parentType);
- if (!StringUtils.isBlank(parentKey) && !StringUtils.isBlank(parentValue)) {
+ if (StringUtils.isNotBlank(parentKey) && StringUtils.isNotBlank(parentValue)) {
sb.append("[@").append(parentKey).append("='").append(parentValue).append("']");
}
sb.append("/").append(childPrefix).append(':').append(this.type);
- if (!StringUtils.isBlank(childKey) && !StringUtils.isBlank(childValue)) {
+ if (StringUtils.isNotBlank(childKey) && StringUtils.isNotBlank(childValue)) {
sb.append("[@").append(childKey).append("='").append(childValue).append("']");
}
this.searchString = sb.toString();
@@ -175,9 +173,9 @@ public class XmlEntity implements VersionedDataSerializable {
* @since GemFire 8.1
*/
private void init() {
- Assert.assertTrue(!StringUtils.isBlank(type));
- Assert.assertTrue(!StringUtils.isBlank(prefix));
- Assert.assertTrue(!StringUtils.isBlank(namespace));
+ Assert.assertTrue(StringUtils.isNotBlank(type));
+ Assert.assertTrue(StringUtils.isNotBlank(prefix));
+ Assert.assertTrue(StringUtils.isNotBlank(namespace));
Assert.assertTrue(attributes != null);
if (null == xmlDefinition) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
index 837d99e..ac5e99a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java
@@ -14,18 +14,16 @@
*/
package org.apache.geode.management.internal.configuration.messages;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Set;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.lang.StringUtils;
-
/***
* Request sent by a member to the locator requesting the shared configuration
*
@@ -50,7 +48,7 @@ public class ConfigurationRequest implements DataSerializableFixedID {
}
public void addGroups(String group) {
- if (!StringUtils.isBlank(group))
+ if (StringUtils.isNotBlank(group))
this.groups.add(group);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
index 3248c98..cb9951f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java
@@ -14,6 +14,15 @@
*/
package org.apache.geode.management.internal.configuration.messages;
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.management.internal.configuration.domain.Configuration;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+import org.xml.sax.SAXException;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -22,21 +31,10 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
-import org.xml.sax.SAXException;
-
-import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.internal.Version;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-
/***
* Response containing the configuration requested by the {@link ConfigurationRequest}
*/
@@ -127,7 +125,7 @@ public class ConfigurationResponse implements DataSerializableFixedID {
try {
String cacheXmlContent = config.getCacheXmlContent();
- if (!StringUtils.isBlank(cacheXmlContent)) {
+ if (StringUtils.isNotBlank(cacheXmlContent)) {
sb.append("\n" + XmlUtils.prettyXml(cacheXmlContent));
}
} catch (IOException | TransformerFactoryConfigurationError | TransformerException
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
index 218762c..f86b9a3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java
@@ -14,12 +14,24 @@
*/
package org.apache.geode.management.internal.configuration.utils;
-import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION;
-import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_PREFIX;
import static javax.xml.XMLConstants.NULL_NS_URI;
import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
+import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION;
+import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_PREFIX;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
+import org.apache.geode.management.internal.configuration.domain.CacheElement;
+import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
-import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -33,7 +45,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -50,20 +61,6 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.management.internal.configuration.domain.CacheElement;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-
public class XmlUtils {
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
index 0b64a44..54c29f8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java
@@ -15,36 +15,6 @@
package org.apache.geode.management.internal.web.controllers;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
-import java.net.URI;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
-import javax.management.JMX;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
-
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
@@ -64,6 +34,34 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.web.controllers.support.LoginHandlerInterceptor;
import org.apache.geode.management.internal.web.util.UriUtils;
import org.apache.geode.security.NotAuthorizedException;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.net.URI;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import javax.management.JMX;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
/**
* The AbstractCommandsController class is the abstract base class encapsulating common
@@ -251,7 +249,7 @@ public abstract class AbstractCommandsController {
* @see java.lang.String
*/
protected static boolean hasValue(final String value) {
- return !StringUtils.isBlank(value);
+ return StringUtils.isNotBlank(value);
}
/**
@@ -530,7 +528,7 @@ public abstract class AbstractCommandsController {
if (hasValue(optionValue)) {
final String optionValueString = (optionValue instanceof String[]
- ? StringUtils.concat((String[]) optionValue, StringUtils.COMMA_DELIMITER)
+ ? StringUtils.join((String[]) optionValue, StringUtils.COMMA_DELIMITER)
: String.valueOf(optionValue));
command.addOption(optionName, optionValueString);
} else if (request != null && request.getParameterMap().containsKey(optionName)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
index f468c65..25d0cc3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -30,6 +27,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+
/**
* The ConfigCommandsController class implements GemFire Management REST API web service endpoints
* for the Gfsh Config Commands.
@@ -184,12 +184,12 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
if (hasValue(groups)) {
command.addOption(CliStrings.EXPORT_CONFIG__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.EXPORT_CONFIG__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(directory)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
index 3a8ed82..ce2ed54 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
@@ -215,12 +215,12 @@ public class DataCommandsController extends AbstractCommandsController {
if (hasValue(includedRegions)) {
command.addOption(CliStrings.REBALANCE__INCLUDEREGION,
- StringUtils.concat(includedRegions, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(includedRegions, StringUtils.COMMA_DELIMITER));
}
if (hasValue(excludedRegions)) {
command.addOption(CliStrings.REBALANCE__EXCLUDEREGION,
- StringUtils.concat(excludedRegions, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(excludedRegions, StringUtils.COMMA_DELIMITER));
}
command.addOption(CliStrings.REBALANCE__SIMULATE, String.valueOf(simulate));
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
index fe5be62..35f57ef 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
@@ -14,13 +14,10 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import java.io.IOException;
-
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.web.util.ConvertUtils;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -28,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+
/**
* The DeployCommandsController class implements the GemFire Management REST API web service
* endpoints for the Gfsh Deploy Commands.
@@ -55,7 +54,7 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
if (hasValue(groups)) {
command.addOption(CliStrings.LIST_DEPLOYED__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -75,7 +74,7 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
if (hasValue(groups)) {
command.addOption(CliStrings.DEPLOY__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(jarFileName)) {
@@ -101,12 +100,12 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
if (hasValue(groups)) {
command.addOption(CliStrings.UNDEPLOY__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(jarFileNames)) {
command.addOption(CliStrings.UNDEPLOY__JAR,
- StringUtils.concat(jarFileNames, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(jarFileNames, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
index 661340c..fa074c3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import java.util.concurrent.Callable;
-
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -27,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.concurrent.Callable;
+
/**
* The DiskStoreCommandsController class implements GemFire Management REST API web service
* endpoints for the Gfsh Disk Store Commands.
@@ -80,7 +80,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.COMPACT_DISK_STORE__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return getProcessCommandCallable(command.toString());
@@ -115,8 +115,10 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
command.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreNameId);
- command.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
- StringUtils.concat(directoryAndSizes, StringUtils.COMMA_DELIMITER));
+ if (hasValue(directoryAndSizes)) {
+ command.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
+ StringUtils.join(directoryAndSizes, StringUtils.COMMA_DELIMITER));
+ }
command.addOption(CliStrings.CREATE_DISK_STORE__ALLOW_FORCE_COMPACTION,
String.valueOf(Boolean.TRUE.equals(allowForceCompaction)));
command.addOption(CliStrings.CREATE_DISK_STORE__AUTO_COMPACT,
@@ -135,7 +137,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_DISK_STORE__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -163,7 +165,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.DESTROY_DISK_STORE__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
index 1d718b4..8f31f7a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
@@ -19,7 +19,11 @@ import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
/**
* The DurableClientCommandsController class implements GemFire Management REST API web service
@@ -59,7 +63,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
if (hasValue(groups)) {
command.addOption(CliStrings.LIST_DURABLE_CQS__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -109,7 +113,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
if (hasValue(groups)) {
command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -134,7 +138,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
if (hasValue(groups)) {
command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -161,7 +165,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
if (hasValue(groups)) {
command.addOption(CliStrings.CLOSE_DURABLE_CQS__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
index 604bdee..a369c6e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
@@ -64,7 +64,7 @@ public class ExportLogController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.EXPORT_LOGS__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(memberNameId)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
index 77cfb40..508c335 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import java.util.concurrent.Callable;
-
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -27,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.concurrent.Callable;
+
/**
* The FunctionCommandsController class implements GemFire Management REST API web service endpoints
* for the Gfsh Function Commands.
@@ -60,12 +60,12 @@ public class FunctionCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.LIST_FUNCTION__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.LIST_FUNCTION__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(matches)) {
@@ -108,7 +108,7 @@ public class FunctionCommandsController extends AbstractCommandsController {
if (hasValue(arguments)) {
command.addOption(CliStrings.EXECUTE_FUNCTION__ARGUMENTS,
- StringUtils.concat(arguments, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(arguments, StringUtils.COMMA_DELIMITER));
}
if (hasValue(filter)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
index d19aee1..9b13b5f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
@@ -85,7 +85,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
if (hasValue(groups)) {
command.addOption(CliStrings.GC__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -175,7 +175,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
if (hasValue(categories)) {
command.addOption(CliStrings.SHOW_METRICS__CATEGORY,
- StringUtils.concat(categories, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(categories, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java
index c68ee35..c757fd3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -72,12 +71,12 @@ public class PdxCommandsController extends AbstractCommandsController {
if (hasValue(autoSerializerClasses)) {
command.addOption(CliStrings.CONFIGURE_PDX__AUTO__SERIALIZER__CLASSES,
- StringUtils.concat(autoSerializerClasses, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(autoSerializerClasses, StringUtils.COMMA_DELIMITER));
}
if (hasValue(portableAutoSerializerClasses)) {
command.addOption(CliStrings.CONFIGURE_PDX__PORTABLE__AUTO__SERIALIZER__CLASSES,
- StringUtils.concat(portableAutoSerializerClasses, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(portableAutoSerializerClasses, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -97,7 +96,7 @@ public class PdxCommandsController extends AbstractCommandsController {
if (hasValue(diskDirs)) {
command.addOption(CliStrings.PDX_DISKDIR,
- StringUtils.concat(diskDirs, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(diskDirs, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -118,7 +117,7 @@ public class PdxCommandsController extends AbstractCommandsController {
if (hasValue(diskDirs)) {
command.addOption(CliStrings.PDX_DISKDIR,
- StringUtils.concat(diskDirs, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(diskDirs, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
index 396726e..df49e49 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -88,12 +87,12 @@ public class QueueCommandsController extends AbstractCommandsController {
if (hasValue(listenerParametersValues)) {
command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE,
- StringUtils.concat(listenerParametersValues, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(listenerParametersValues, StringUtils.COMMA_DELIMITER));
}
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,
@@ -138,7 +137,7 @@ public class QueueCommandsController extends AbstractCommandsController {
if (hasValue(gatewayEventFilters)) {
command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GATEWAYEVENTFILTER,
- StringUtils.concat(gatewayEventFilters, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewayEventFilters, StringUtils.COMMA_DELIMITER));
}
if (hasValue(gatewaySubstitutionFilter)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
index e503e56..baf24e5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -116,7 +115,7 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.ALTER_REGION__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
addCommandOption(request, command, CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
@@ -243,7 +242,7 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_REGION__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
command.addOption(CliStrings.CREATE_REGION__SKIPIFEXISTS,
@@ -323,7 +322,7 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(cacheListeners)) {
command.addOption(CliStrings.CREATE_REGION__CACHELISTENER,
- StringUtils.concat(cacheListeners, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(cacheListeners, StringUtils.COMMA_DELIMITER));
}
if (hasValue(cacheLoader)) {
@@ -336,12 +335,12 @@ public class RegionCommandsController extends AbstractCommandsController {
if (hasValue(asyncEventQueueIds)) {
command.addOption(CliStrings.CREATE_REGION__ASYNCEVENTQUEUEID,
- StringUtils.concat(asyncEventQueueIds, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(asyncEventQueueIds, StringUtils.COMMA_DELIMITER));
}
if (hasValue(gatewaySenderIds)) {
command.addOption(CliStrings.CREATE_REGION__GATEWAYSENDERID,
- StringUtils.concat(gatewaySenderIds, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewaySenderIds, StringUtils.COMMA_DELIMITER));
}
if (Boolean.TRUE.equals(enableConcurrencyChecks)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
index 0ecb77f..e983f2a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java
@@ -14,14 +14,15 @@
*/
package org.apache.geode.management.internal.web.controllers;
-import java.io.IOException;
-import java.util.Set;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.web.domain.Link;
+import org.apache.geode.management.internal.web.domain.LinkIndex;
+import org.apache.geode.management.internal.web.domain.QueryParameterSource;
+import org.apache.geode.management.internal.web.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -32,15 +33,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.web.domain.Link;
-import org.apache.geode.management.internal.web.domain.LinkIndex;
-import org.apache.geode.management.internal.web.domain.QueryParameterSource;
-import org.apache.geode.management.internal.web.http.HttpMethod;
+import java.io.IOException;
+import java.util.Set;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
/**
* The ShellCommandsController class implements GemFire REST API calls for Gfsh Shell Commands.
@@ -97,7 +95,7 @@ public class ShellCommandsController extends AbstractCommandsController {
@RequestParam("operationName") final String operationName,
@RequestParam(value = "signature", required = false) String[] signature,
@RequestParam(value = "parameters", required = false) Object[] parameters) {
- signature = (signature != null ? signature : StringUtils.EMPTY_STRING_ARRAY);
+ signature = (signature != null ? signature : ArrayUtils.EMPTY_STRING_ARRAY);
parameters = (parameters != null ? parameters : ObjectUtils.EMPTY_OBJECT_ARRAY);
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
index fa5aa57..4fd4b96 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java
@@ -18,7 +18,6 @@ package org.apache.geode.management.internal.web.controllers;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,12 +53,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.LIST_GATEWAY__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.LIST_GATEWAY__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -90,7 +89,7 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(manualStart)) {
@@ -100,7 +99,7 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(members)) {
command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(startPort)) {
@@ -127,7 +126,7 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(gatewayTransportFilters)) {
command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER,
- StringUtils.concat(gatewayTransportFilters, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewayTransportFilters, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -182,12 +181,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
if (hasValue(parallel)) {
@@ -257,12 +256,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(gatewayEventFilters)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__GATEWAYEVENTFILTER,
- StringUtils.concat(gatewayEventFilters, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewayEventFilters, StringUtils.COMMA_DELIMITER));
}
if (hasValue(gatewayTransportFilters)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__GATEWAYTRANSPORTFILTER,
- StringUtils.concat(gatewayTransportFilters, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(gatewayTransportFilters, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -281,12 +280,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
}
@@ -318,12 +317,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.PAUSE_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.PAUSE_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -344,12 +343,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.RESUME_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.RESUME_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -367,12 +366,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.START_GATEWAYRECEIVER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.START_GATEWAYRECEIVER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -393,12 +392,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.START_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.START_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -415,12 +414,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -439,12 +438,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.STATUS_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.STATUS_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -461,12 +460,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.STOP_GATEWAYRECEIVER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.STOP_GATEWAYRECEIVER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
@@ -485,12 +484,12 @@ public class WanCommandsController extends AbstractCommandsController {
if (hasValue(groups)) {
command.addOption(CliStrings.STOP_GATEWAYSENDER__GROUP,
- StringUtils.concat(groups, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
}
if (hasValue(members)) {
command.addOption(CliStrings.STOP_GATEWAYSENDER__MEMBER,
- StringUtils.concat(members, StringUtils.COMMA_DELIMITER));
+ StringUtils.join(members, StringUtils.COMMA_DELIMITER));
}
return processCommand(command.toString());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
index cef8cab..3ec04c7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java
@@ -14,16 +14,16 @@
*/
package org.apache.geode.management.internal.web.domain;
-import java.io.Serializable;
-import java.net.URI;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.internal.web.http.HttpMethod;
import org.apache.geode.management.internal.web.util.UriUtils;
+import java.io.Serializable;
+import java.net.URI;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
/**
* The Link class models hypermedia controls/link relations.
* <p/>
@@ -97,7 +97,7 @@ public class Link implements Comparable<Link>, Serializable {
}
public final void setRelation(final String relation) {
- assert !StringUtils.isBlank(relation) : "The Link relation (rel) must be specified!";
+ assert StringUtils.isNotBlank(relation) : "The Link relation (rel) must be specified!";
this.relation = relation;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java
index 7d5bb37..2a99e82 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.management.internal.web.domain;
+import org.apache.commons.lang.StringUtils;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -26,8 +28,6 @@ import java.util.TreeSet;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.geode.internal.lang.StringUtils;
-
/**
* The LinkIndex class is abstraction for modeling an index of Links.
* <p/>
@@ -127,7 +127,7 @@ public class LinkIndex implements Iterable<Link> {
int count = 0;
for (final Link link : this) {
- buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY_STRING).append(link);
+ buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY).append(link);
}
buffer.append("]");
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java
index ee7e932..74836bc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.web.http;
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* The HttpHeader enum is an enumeration of all HTTP request/response header names.
@@ -78,7 +78,7 @@ public enum HttpHeader {
private final String name;
HttpHeader(final String name) {
- assert !StringUtils.isBlank(name) : "The name of the HTTP request header must be specified!";
+ assert StringUtils.isNotBlank(name) : "The name of the HTTP request header must be specified!";
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java
index eeedf40..13fd42c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java
@@ -15,9 +15,9 @@
package org.apache.geode.management.internal.web.shell;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.internal.lang.Filter;
import org.apache.geode.internal.lang.Initable;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.CommandRequest;
@@ -447,7 +447,7 @@ public class RestHttpOperationInvoker extends AbstractHttpOperationInvoker imple
@Override
public boolean accept(final Map.Entry<String, String> entry) {
- return !StringUtils.isBlank(entry.getValue());
+ return StringUtils.isNotBlank(entry.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
index f3b092d..0b6fbe3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.management.internal.web.util;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.geode.internal.lang.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.web.io.MultipartFileResourceAdapter;
-
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* The ConvertUtils class is a support class for performing conversions used by the GemFire web
* application and REST interface.
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
index b83064e..a22ee13 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java
@@ -19,8 +19,6 @@ import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Map;
-import org.apache.geode.internal.lang.StringUtils;
-
/**
* The UriUtils is a utility class for processing URIs and URLs.
* <p/>
@@ -32,7 +30,7 @@ import org.apache.geode.internal.lang.StringUtils;
@SuppressWarnings("unused")
public abstract class UriUtils {
- public static final String DEFAULT_ENCODING = StringUtils.UTF_8;
+ public static final String DEFAULT_ENCODING = "UTF-8";
/**
* Decodes the encoded String value using the default encoding, UTF-8. It is assumed the String
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
index c3b349a..7c168dc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
@@ -14,10 +14,20 @@
*/
package org.apache.geode.cache.client.internal;
-import org.apache.geode.internal.lang.StringUtils;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-
-import org.apache.geode.cache.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.server.CacheServer;
@@ -25,16 +35,26 @@ import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.cache.PoolFactoryImpl;
-import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
/**
*
@@ -198,8 +218,8 @@ public abstract class LocatorTestBase extends JUnit4DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- if (useGroupsProperty) {
- props.setProperty(GROUPS, StringUtils.concat(groups, ","));
+ if (useGroupsProperty && groups != null) {
+ props.setProperty(GROUPS, StringUtils.join(groups, ","));
}
DistributedSystem ds = getSystem(props);
Cache cache = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
index 09fa09e..bf6a854 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
@@ -17,9 +17,9 @@ package org.apache.geode.distributed;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertTrue;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.process.PidUnavailableException;
import org.apache.geode.internal.process.ProcessStreamReader.InputListener;
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index 62d4bdd..416b459 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -14,10 +14,14 @@
*/
package org.apache.geode.distributed;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import org.apache.geode.internal.lang.StringUtils;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -108,11 +112,11 @@ public class AbstractLauncherTest {
assertNotNull(distributedSystemProperties);
assertFalse(distributedSystemProperties.containsKey(NAME));
- launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "333");
+ launcher = createAbstractLauncher(StringUtils.EMPTY, "333");
assertNotNull(launcher);
assertEquals("333", launcher.getMemberId());
- assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberName());
+ assertEquals(StringUtils.EMPTY, launcher.getMemberName());
distributedSystemProperties = launcher.getDistributedSystemProperties();
@@ -166,11 +170,11 @@ public class AbstractLauncherTest {
assertNull(launcher.getMemberName());
assertEquals("123", launcher.getMember());
- launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "123");
+ launcher = createAbstractLauncher(StringUtils.EMPTY, "123");
assertNotNull(launcher);
assertEquals("123", launcher.getMemberId());
- assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberName());
+ assertEquals(StringUtils.EMPTY, launcher.getMemberName());
assertEquals("123", launcher.getMember());
launcher = createAbstractLauncher(" ", "123");
@@ -180,10 +184,10 @@ public class AbstractLauncherTest {
assertEquals(" ", launcher.getMemberName());
assertEquals("123", launcher.getMember());
- launcher = createAbstractLauncher(null, StringUtils.EMPTY_STRING);
+ launcher = createAbstractLauncher(null, StringUtils.EMPTY);
assertNotNull(launcher);
- assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberId());
+ assertEquals(StringUtils.EMPTY, launcher.getMemberId());
assertNull(launcher.getMemberName());
assertNull(launcher.getMember());
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
index 5b53c6a..b856361 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.distributed;
+import static com.googlecode.catchexception.apis.BDDCatchException.caughtException;
+import static com.googlecode.catchexception.apis.BDDCatchException.when;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.BDDAssertions.assertThat;
+import static org.assertj.core.api.BDDAssertions.then;
+
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -33,12 +39,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.util.Properties;
-import static com.googlecode.catchexception.apis.BDDCatchException.caughtException;
-import static com.googlecode.catchexception.apis.BDDCatchException.when;
-import static org.assertj.core.api.BDDAssertions.assertThat;
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Integration tests for LocatorLauncher. These tests require file system I/O.
*/
@@ -110,7 +110,7 @@ public class LocatorLauncherIntegrationTest {
gemfireProperties);
// when: starting with null MemberName
- LocatorLauncher launcher = new Builder().setCommand(Command.START).setMemberName(null).build();
+ LocatorLauncher launcher = new Builder().setCommand(Command.START).build();
// then: name in gemfire.properties file should be used for MemberName
assertThat(launcher).isNotNull();
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
index 06d6054..50cea4d 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -14,13 +14,22 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.UnitTest;
-import joptsimple.OptionException;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -29,9 +38,8 @@ import org.junit.rules.TestName;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import joptsimple.OptionException;
-import static org.junit.Assert.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
* The LocatorLauncherTest class is a test suite of test cases for testing the contract and
@@ -53,6 +61,11 @@ public class LocatorLauncherTest {
@Rule
public final TestName testName = new TestName();
+ @Before
+ public void setup() {
+ DistributedSystem.removeSystem(InternalDistributedSystem.getConnectedInstance());
+ }
+
@Test(expected = IllegalArgumentException.class)
public void testBuilderParseArgumentsWithNonNumericPort() {
try {
@@ -154,8 +167,6 @@ public class LocatorLauncherTest {
assertNull(builder.getHostnameForClients());
assertSame(builder, builder.setHostnameForClients("Pegasus"));
assertEquals("Pegasus", builder.getHostnameForClients());
- assertSame(builder, builder.setHostnameForClients(null));
- assertNull(builder.getHostnameForClients());
}
@Test(expected = IllegalArgumentException.class)
@@ -184,6 +195,19 @@ public class LocatorLauncherTest {
}
}
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetHostnameForClientsWithNullString() {
+ try {
+ new Builder().setHostnameForClients(null);
+ } catch (IllegalArgumentException expected) {
+ assertEquals(
+ LocalizedStrings.LocatorLauncher_Builder_INVALID_HOSTNAME_FOR_CLIENTS_ERROR_MESSAGE
+ .toLocalizedString(),
+ expected.getMessage());
+ throw expected;
+ }
+ }
+
@Test
public void testSetAndGetMemberName() {
Builder builder = new Builder();
@@ -191,8 +215,6 @@ public class LocatorLauncherTest {
assertNull(builder.getMemberName());
assertSame(builder, builder.setMemberName("locatorOne"));
assertEquals("locatorOne", builder.getMemberName());
- assertSame(builder, builder.setMemberName(null));
- assertNull(builder.getMemberName());
}
@Test(expected = IllegalArgumentException.class)
@@ -219,6 +241,18 @@ public class LocatorLauncherTest {
}
}
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetMemberNameWithNullString() {
+ try {
+ new Builder().setMemberName(null);
+ } catch (IllegalArgumentException expected) {
+ assertEquals(
+ LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE.toLocalizedString("Locator"),
+ expected.getMessage());
+ throw expected;
+ }
+ }
+
@Test
public void testSetAndGetPid() {
Builder builder = new Builder();
@@ -299,7 +333,7 @@ public class LocatorLauncherTest {
.setHostnameForClients("beanstock.vmware.com").setMemberName("Beanstock").setPort(8192)
.build();
- assertNotNull(launcher);
+ assertThat(launcher).isNotNull();
assertEquals(builder.getCommand(), launcher.getCommand());
assertTrue(launcher.isDebugging());
assertEquals(builder.getHostnameForClients(), launcher.getHostnameForClients());
@@ -312,10 +346,10 @@ public class LocatorLauncherTest {
@Test
public void testBuildWithMemberNameSetInApiPropertiesOnStart() {
- LocatorLauncher launcher = new Builder().setCommand(LocatorLauncher.Command.START)
- .setMemberName(null).set(NAME, "locatorABC").build();
+ LocatorLauncher launcher =
+ new Builder().setCommand(LocatorLauncher.Command.START).set(NAME, "locatorABC").build();
- assertNotNull(launcher);
+ assertThat(launcher).isNotNull();
assertEquals(LocatorLauncher.Command.START, launcher.getCommand());
assertNull(launcher.getMemberName());
assertEquals("locatorABC", launcher.getProperties().getProperty(NAME));
@@ -325,10 +359,9 @@ public class LocatorLauncherTest {
public void testBuildWithMemberNameSetInSystemPropertiesOnStart() {
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "locatorXYZ");
- LocatorLauncher launcher =
- new Builder().setCommand(LocatorLauncher.Command.START).setMemberName(null).build();
+ LocatorLauncher launcher = new Builder().setCommand(LocatorLauncher.Command.START).build();
- assertNotNull(launcher);
+ assertThat(launcher).isNotNull();
assertEquals(LocatorLauncher.Command.START, launcher.getCommand());
assertNull(launcher.getMemberName());
}