You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/05 17:32:28 UTC
[1/7] geode git commit: Change GemFireCacheImpl to InternalCache
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-12 0c36d5f8e -> bccdb56e2
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
index 822fc99..801157e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
@@ -24,6 +24,7 @@ import org.apache.geode.InternalGemFireException;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.tcp.ByteBufferInputStream;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
@@ -560,7 +561,6 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
}
/**
- *
* @param idx of the variable length field
* @return the offset to the variable length field
*/
@@ -697,10 +697,10 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
// only create a tracking one if we might need it
UnreadPdxType unreadLocalPdxType = null;
boolean needToTrackReads = TESTHOOK_TRACKREADS;
- GemFireCacheImpl gfc = GemFireCacheImpl
+ InternalCache cache = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
- TypeRegistry tr = gfc.getPdxRegistry();
- if (!gfc.getPdxIgnoreUnreadFields()) {
+ TypeRegistry tr = cache.getPdxRegistry();
+ if (!cache.getPdxIgnoreUnreadFields()) {
PdxType localPdxType = tr.getExistingTypeForClass(pdxClass);
if (localPdxType != null) {
if (getPdxType().getTypeId() != localPdxType.getTypeId()
@@ -736,7 +736,7 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
}
((PdxSerializable) result).fromData(pdxReader);
} else {
- PdxSerializer pdxSerializer = gfc.getPdxSerializer();
+ PdxSerializer pdxSerializer = cache.getPdxSerializer();
if (pdxSerializer != null) {
result = pdxSerializer.fromData(pdxClass, pdxReader);
if (result == null) {
@@ -843,8 +843,6 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
public void orderedDeserialize(Object obj, AutoClassInfo ci) {
PdxReaderImpl reader = prepForOrderedReading();
for (PdxFieldWrapper f : ci.getFields()) {
- // System.out.println("DEBUG reading field=" + f.getField().getName() + " offset=" +
- // reader.dis.position());
f.orderedDeserialize(reader, obj);
}
}
@@ -866,8 +864,6 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
}
/**
- *
- * @param field
* @return PdxString if field is a String otherwise invokes {@link #readField(String)}
*/
public Object readRawField(String field) {
@@ -888,9 +884,6 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
/**
* This method checks whether Object field is String type. If its String then it returns PdxString
* otherwise null.
- *
- * @param ft
- * @return
*/
private PdxString getPdxStringFromObjectField(PdxField ft) {
if (ft.getFieldType() == FieldType.OBJECT) {
@@ -912,8 +905,6 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
}
/**
- *
- * @param ft
* @return returns {@link PdxString}
*/
public PdxString readPdxString(PdxField ft) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
index 82883b1..d2621b5 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxUnreadData.java
@@ -14,15 +14,13 @@
*/
package org.apache.geode.pdx.internal;
-import java.nio.ByteBuffer;
-
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.pdx.PdxFieldAlreadyExistsException;
import org.apache.geode.pdx.PdxUnreadFields;
/**
- *
* @since GemFire 6.6
*/
public class PdxUnreadData implements PdxUnreadFields {
@@ -31,6 +29,7 @@ public class PdxUnreadData implements PdxUnreadFields {
* This is the original type of the blob that we deserialized and did not read some of its fields.
*/
private UnreadPdxType unreadType;
+
private byte[][] unreadData;
public PdxUnreadData() {
@@ -104,10 +103,10 @@ public class PdxUnreadData implements PdxUnreadFields {
// This method is only called by CopyHelper which is public and does not require that a Cache
// exists.
// So we need to call getInstance instead of getExisting.
- GemFireCacheImpl gfc = GemFireCacheImpl.getInstance();
- if (gfc == null)
+ InternalCache cache = GemFireCacheImpl.getInstance();
+ if (cache == null)
return;
- TypeRegistry tr = gfc.getPdxRegistry();
+ TypeRegistry tr = cache.getPdxRegistry();
PdxUnreadData ud = tr.getUnreadData(o);
if (ud != null && !ud.isEmpty()) {
tr.putUnreadData(copy, ud);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
index 2aee53c..61be1ad 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxWriterImpl.java
@@ -14,6 +14,11 @@
*/
package org.apache.geode.pdx.internal;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Date;
+
import org.apache.geode.InternalGemFireException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.DSCODE;
@@ -21,14 +26,16 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
-import org.apache.geode.pdx.*;
+import org.apache.geode.pdx.FieldType;
+import org.apache.geode.pdx.PdxFieldAlreadyExistsException;
+import org.apache.geode.pdx.PdxFieldDoesNotExistException;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxSerializationException;
+import org.apache.geode.pdx.PdxUnreadFields;
+import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Date;
-
/**
* A new instance of this class is created for each (nested) instance of {@link PdxSerializable}.
* But it may share the underlying instance of {@link HeapDataOutputStream} with other instances of
@@ -47,6 +54,7 @@ public class PdxWriterImpl implements PdxWriter {
* tr is no longer final because it is initialized late when using a PdxSerializer.
*/
private TypeRegistry tr;
+
private final Object pdx;
private final PdxOutputStream os;
private final AutoClassInfo aci;
@@ -55,16 +63,20 @@ public class PdxWriterImpl implements PdxWriter {
* Offsets to the variable length fields.
*/
private int[] vlfOffsets;
+
/**
* The number of variable length fields that need an offset. The first VLF does not need an
* offset.
*/
private int vlfCount = 0;
+
private boolean hasSeenFirstVlf = false;
+
/**
* The offset into the hdos to the header.
*/
protected final int headerOffset;
+
private PdxUnreadData unreadData;
private PdxType existingType;
@@ -80,6 +92,7 @@ public class PdxWriterImpl implements PdxWriter {
*/
private static final boolean sysPropDoExtraPdxValidation =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "validatePdxWriters");
+
private boolean doExtraValidation = sysPropDoExtraPdxValidation;
public PdxWriterImpl(TypeRegistry tr, Object pdx, PdxOutputStream out) {
@@ -543,7 +556,6 @@ public class PdxWriterImpl implements PdxWriter {
}
/**
- *
* @return the offset to the byte of the first field
*/
private int getBaseOffset() {
@@ -561,11 +573,7 @@ public class PdxWriterImpl implements PdxWriter {
int fieldDataSize = getCurrentOffset();
// Take the list of offsets and append it in reverse order.
byte sizeOfOffset = getSizeOfOffset(this.vlfCount, fieldDataSize);
- // System.out.println("Size of each offset: " + sizeOfOffset +
- // " byte(s), curPos: " + this.curPos + ", numOfOffsets: " +
- // this.offsetIndex);
for (int i = (this.vlfCount - 1); i >= 0; i--) {
- // System.out.println("offset[" + i + "]: " + this.offsets[i]);
switch (sizeOfOffset) {
case 1:
this.os.write((byte) this.vlfOffsets[i]);
@@ -612,7 +620,6 @@ public class PdxWriterImpl implements PdxWriter {
return this.os.toByteArray();
}
-
private void markVariableField() {
if (!this.hasSeenFirstVlf) {
this.hasSeenFirstVlf = true;
@@ -829,7 +836,6 @@ public class PdxWriterImpl implements PdxWriter {
}
}
-
private HeapDataOutputStream.LongUpdater lu;
private void writeHeader() {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
index 6b22aac..065255b 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
@@ -28,7 +28,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.DiskStore;
@@ -99,8 +98,10 @@ public class PeerTypeRegistration implements TypeRegistration {
*/
private Map<PdxType, Integer> typeToId =
Collections.synchronizedMap(new HashMap<PdxType, Integer>());
+
private Map<EnumInfo, EnumId> enumToId =
Collections.synchronizedMap(new HashMap<EnumInfo, EnumId>());
+
private final Map<String, Set<PdxType>> classToType =
new CopyOnWriteHashMap<String, Set<PdxType>>();
@@ -404,11 +405,11 @@ public class PeerTypeRegistration implements TypeRegistration {
private void updateRegion(Object k, Object v) {
Region<Object, Object> r = getIdToType();
- Cache c = (Cache) r.getRegionService();
+ InternalCache cache = (InternalCache) r.getRegionService();
checkDistributedTypeRegistryState();
- TXManagerImpl txManager = (TXManagerImpl) c.getCacheTransactionManager();
+ TXManagerImpl txManager = (TXManagerImpl) cache.getCacheTransactionManager();
TXStateProxy currentState = suspendTX();
boolean state = useUDPMessagingIfNecessary();
try {
@@ -452,7 +453,6 @@ public class PeerTypeRegistration implements TypeRegistration {
} finally {
resumeTX(currentState);
}
-
}
public void addRemoteType(int typeId, PdxType type) {
@@ -626,8 +626,8 @@ public class PeerTypeRegistration implements TypeRegistration {
}
private TXStateProxy suspendTX() {
- Cache c = (Cache) getIdToType().getRegionService();
- TXManagerImpl txManager = (TXManagerImpl) c.getCacheTransactionManager();
+ InternalCache cache = (InternalCache) getIdToType().getRegionService();
+ TXManagerImpl txManager = (TXManagerImpl) cache.getCacheTransactionManager();
return txManager.internalSuspend();
}
@@ -748,7 +748,6 @@ public class PeerTypeRegistration implements TypeRegistration {
return enums;
}
-
/**
* adds a PdxType for a field to a {@code className => Set<PdxType>} map
*/
@@ -780,14 +779,14 @@ public class PeerTypeRegistration implements TypeRegistration {
return null;
}
- /*
+ /**
* For testing purpose
*/
public Map<String, Set<PdxType>> getClassToType() {
return classToType;
}
- /*
+ /**
* test hook
*/
@Override
@@ -813,7 +812,7 @@ public class PeerTypeRegistration implements TypeRegistration {
}
public static int getPdxRegistrySize() {
- GemFireCacheImpl cache = GemFireCacheImpl.getExisting();
+ InternalCache cache = GemFireCacheImpl.getExisting();
if (cache == null) {
return 0;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/WritablePdxInstanceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/WritablePdxInstanceImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/WritablePdxInstanceImpl.java
index cb080b6..1006d96 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/WritablePdxInstanceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/WritablePdxInstanceImpl.java
@@ -19,6 +19,7 @@ import java.util.Date;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxFieldDoesNotExistException;
import org.apache.geode.pdx.PdxFieldTypeMismatchException;
import org.apache.geode.pdx.WritablePdxInstance;
@@ -80,9 +81,9 @@ public class WritablePdxInstanceImpl extends PdxInstanceImpl implements Writable
if (getPdxType().getHasDeletedField()) {
// Need a new type that does not have the deleted field
PdxType pt = new PdxType(getPdxType().getClassName(), !getPdxType().getNoDomainClass());
- GemFireCacheImpl gfc = GemFireCacheImpl
+ InternalCache cache = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
- TypeRegistry tr = gfc.getPdxRegistry();
+ TypeRegistry tr = cache.getPdxRegistry();
writer = new PdxWriterImpl(pt, tr, os);
} else {
writer = new PdxWriterImpl(getPdxType(), os);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceHelper.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceHelper.java
index 39d16a5..fc21bf0 100755
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceHelper.java
@@ -20,13 +20,13 @@ import java.math.BigInteger;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
-/*
+/**
* This class is intermediate class to create PdxInstance.
*/
public class PdxInstanceHelper implements JSONToPdxMapper {
@@ -37,15 +37,19 @@ public class PdxInstanceHelper implements JSONToPdxMapper {
PdxInstance m_pdxInstance;
String m_PdxName;// when pdx is member, else null if part of lists
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
public PdxInstanceHelper(String className, JSONToPdxMapper parent) {
- GemFireCacheImpl gci = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (logger.isTraceEnabled()) {
logger.trace("ClassName {}", className);
}
m_PdxName = className;
m_parent = parent;
- m_pdxInstanceFactory =
- (PdxInstanceFactoryImpl) gci.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
+ m_pdxInstanceFactory = (PdxInstanceFactoryImpl) cache
+ .createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
}
public JSONToPdxMapper getParent() {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
index 7f510da..24e596a 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
@@ -16,28 +16,20 @@ package org.apache.geode.pdx.internal.json;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.concurrent.ConcurrentSkipListMap;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.FieldType;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
-import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
-/*
+/**
* This class is intermediate class to create PdxInstance.
*/
public class PdxInstanceSortedHelper implements JSONToPdxMapper {
@@ -48,8 +40,11 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
PdxInstance m_pdxInstance;
String m_PdxName;// when pdx is member, else null if part of lists
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
public PdxInstanceSortedHelper(String className, JSONToPdxMapper parent) {
- GemFireCacheImpl gci = (GemFireCacheImpl) CacheFactory.getAnyInstance();
if (logger.isTraceEnabled()) {
logger.trace("ClassName {}", className);
}
@@ -57,21 +52,11 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
m_parent = parent;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#getParent()
- */
@Override
public JSONToPdxMapper getParent() {
return m_parent;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#setPdxFieldName(java.lang.String)
- */
@Override
public void setPdxFieldName(String name) {
if (logger.isTraceEnabled()) {
@@ -104,12 +89,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addStringField(java.lang.String,
- * java.lang.String)
- */
@Override
public void addStringField(String fieldName, String value) {
if (logger.isTraceEnabled()) {
@@ -118,11 +97,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.STRING));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addByteField(java.lang.String, byte)
- */
@Override
public void addByteField(String fieldName, byte value) {
if (logger.isTraceEnabled()) {
@@ -131,11 +105,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.BYTE));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addShortField(java.lang.String, short)
- */
@Override
public void addShortField(String fieldName, short value) {
if (logger.isTraceEnabled()) {
@@ -144,11 +113,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.SHORT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addIntField(java.lang.String, int)
- */
@Override
public void addIntField(String fieldName, int value) {
if (logger.isTraceEnabled()) {
@@ -157,11 +121,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.INT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addLongField(java.lang.String, long)
- */
@Override
public void addLongField(String fieldName, long value) {
if (logger.isTraceEnabled()) {
@@ -170,12 +129,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.LONG));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addBigDecimalField(java.lang.String,
- * java.math.BigDecimal)
- */
@Override
public void addBigDecimalField(String fieldName, BigDecimal value) {
if (logger.isTraceEnabled()) {
@@ -184,12 +137,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.OBJECT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addBigIntegerField(java.lang.String,
- * java.math.BigInteger)
- */
@Override
public void addBigIntegerField(String fieldName, BigInteger value) {
if (logger.isTraceEnabled()) {
@@ -198,12 +145,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.OBJECT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addBooleanField(java.lang.String,
- * boolean)
- */
@Override
public void addBooleanField(String fieldName, boolean value) {
if (logger.isTraceEnabled()) {
@@ -212,11 +153,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.BOOLEAN));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addFloatField(java.lang.String, float)
- */
@Override
public void addFloatField(String fieldName, float value) {
if (logger.isTraceEnabled()) {
@@ -225,12 +161,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.FLOAT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addDoubleField(java.lang.String,
- * double)
- */
@Override
public void addDoubleField(String fieldName, double value) {
if (logger.isTraceEnabled()) {
@@ -239,11 +169,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, value, FieldType.DOUBLE));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addNullField(java.lang.String)
- */
@Override
public void addNullField(String fieldName) {
if (logger.isTraceEnabled()) {
@@ -252,12 +177,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, null, FieldType.OBJECT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addListField(java.lang.String,
- * org.apache.geode.pdx.internal.json.PdxListHelper)
- */
@Override
public void addListField(String fieldName, PdxListHelper list) {
if (logger.isTraceEnabled()) {
@@ -267,11 +186,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, list.getList(), FieldType.OBJECT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#endListField(java.lang.String)
- */
@Override
public void endListField(String fieldName) {
if (logger.isTraceEnabled()) {
@@ -279,12 +193,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#addObjectField(java.lang.String,
- * org.apache.geode.pdx.PdxInstance)
- */
@Override
public void addObjectField(String fieldName, Object member) {
if (logger.isTraceEnabled()) {
@@ -296,11 +204,6 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
fieldList.add(new JSONFieldHolder(fieldName, member, FieldType.OBJECT));
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#endObjectField(java.lang.String)
- */
@Override
public void endObjectField(String fieldName) {
if (logger.isTraceEnabled()) {
@@ -352,30 +255,18 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
}
}
-
- static PdxInstanceFactory createPdxInstanceFactory() {
- GemFireCacheImpl gci = (GemFireCacheImpl) CacheFactory.getAnyInstance();
- return gci.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
+ private PdxInstanceFactory createPdxInstanceFactory() {
+ InternalCache cache = getCache();
+ return cache.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#getPdxInstance()
- */
@Override
public PdxInstance getPdxInstance() {
return m_pdxInstance;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.pdx.internal.json.JSONToPdxMapper#getPdxFieldName()
- */
@Override
public String getPdxFieldName() {
- // return m_fieldName != null ? m_fieldName : "emptyclassname"; //when object is just like { }
return m_PdxName;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxListHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxListHelper.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxListHelper.java
index 417e56a..f73a129 100755
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxListHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxListHelper.java
@@ -22,8 +22,7 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
/*
@@ -36,8 +35,12 @@ public class PdxListHelper {
PdxListHelper m_parent;
List list = new LinkedList();
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
public PdxListHelper(PdxListHelper parent, String name) {
- GemFireCacheImpl gci = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
m_name = name;
if (logger.isTraceEnabled()) {
logger.trace("PdxListHelper name: {}", name);
@@ -155,7 +158,6 @@ public class PdxListHelper {
if (logger.isTraceEnabled()) {
logger.trace("addObjectField fieldName: {}", fieldName);
}
- // dpi.setPdxFieldName(fieldName);
list.add(dpi.getPdxInstance());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 32a40dd..9ffc075 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
@@ -45,24 +45,33 @@ import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.oio.OioServerSocketChannel;
import io.netty.util.concurrent.Future;
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.cache.*;
-import org.apache.geode.redis.internal.ByteArrayWrapper;
-import org.apache.geode.redis.internal.ByteToCommandDecoder;
-import org.apache.geode.redis.internal.Coder;
-import org.apache.geode.redis.internal.ExecutionHandlerContext;
-import org.apache.geode.redis.internal.RedisDataType;
-import org.apache.geode.redis.internal.RegionProvider;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.LogWriter;
+import org.apache.geode.annotations.Experimental;
+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.EntryEvent;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.hll.HyperLogLogPlus;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.redis.internal.ByteArrayWrapper;
+import org.apache.geode.redis.internal.ByteToCommandDecoder;
+import org.apache.geode.redis.internal.Coder;
+import org.apache.geode.redis.internal.ExecutionHandlerContext;
+import org.apache.geode.redis.internal.RedisDataType;
+import org.apache.geode.redis.internal.RegionProvider;
/**
* The GeodeRedisServer is a server that understands the Redis protocol. As commands are sent to the
@@ -142,7 +151,7 @@ public class GeodeRedisServer {
private static Thread mainThread = null;
/**
- * The default Redis port as specified by their protocol, {@value #DEFAULT_REDIS_SERVER_PORT}
+ * The default Redis port as specified by their protocol, {@code DEFAULT_REDIS_SERVER_PORT}
*/
public static final int DEFAULT_REDIS_SERVER_PORT = 6379;
@@ -213,25 +222,25 @@ public class GeodeRedisServer {
/**
* The field that defines the name of the {@link Region} which holds all of the strings. The
- * current value of this field is {@value #STRING_REGION}.
+ * current value of this field is {@code STRING_REGION}.
*/
public static final String STRING_REGION = "ReDiS_StRiNgS";
/**
* The field that defines the name of the {@link Region} which holds all of the HyperLogLogs. The
- * current value of this field is {@value #HLL_REGION}.
+ * current value of this field is {@code HLL_REGION}.
*/
public static final String HLL_REGION = "ReDiS_HlL";
/**
* The field that defines the name of the {@link Region} which holds all of the Redis meta data.
- * The current value of this field is {@value #REDIS_META_DATA_REGION}.
+ * The current value of this field is {@code REDIS_META_DATA_REGION}.
*/
public static final String REDIS_META_DATA_REGION = "__ReDiS_MeTa_DaTa";
/**
* The system property name used to set the default {@link Region} creation type. The property
- * name is {@value #DEFAULT_REGION_SYS_PROP_NAME} and the acceptable values are types defined by
+ * name is {@code DEFAULT_REGION_SYS_PROP_NAME} and the acceptable values are types defined by
* {@link RegionShortcut}, i.e. "PARTITION" would be used for {@link RegionShortcut#PARTITION}.
*/
public static final String DEFAULT_REGION_SYS_PROP_NAME = "gemfireredis.regiontype";
@@ -290,7 +299,7 @@ public class GeodeRedisServer {
}
/**
- * Constructor for {@link GeodeRedisServer} that will start the server on the given port and bind
+ * Constructor for {@code GeodeRedisServer} that will start the server on the given port and bind
* to the first non-loopback address
*
* @param port The port the server will bind to, will use {@value #DEFAULT_REDIS_SERVER_PORT} by
@@ -301,7 +310,7 @@ public class GeodeRedisServer {
}
/**
- * Constructor for {@link GeodeRedisServer} that will start the server and bind to the given
+ * Constructor for {@code GeodeRedisServer} that will start the server and bind to the given
* address and port
*
* @param bindAddress The address to which the server will attempt to bind to
@@ -312,9 +321,8 @@ public class GeodeRedisServer {
this(bindAddress, port, null);
}
-
/**
- * Constructor for {@link GeodeRedisServer} that will start the server and bind to the given
+ * Constructor for {@code GeodeRedisServer} that will start the server and bind to the given
* address and port. Keep in mind that the log level configuration will only be set if a
* {@link Cache} does not already exist, if one already exists then setting that property will
* have no effect.
@@ -367,7 +375,7 @@ public class GeodeRedisServer {
}
/**
- * This is function to call on a {@link GeodeRedisServer} instance to start it running
+ * This is function to call on a {@code GeodeRedisServer} instance to start it running
*/
public synchronized void start() {
if (!started) {
@@ -386,24 +394,24 @@ public class GeodeRedisServer {
/**
* Initializes the {@link Cache}, and creates Redis necessities Region and protects declares that
- * {@link Region} to be protected. Also, every {@link GeodeRedisServer} will check for entries
+ * {@link Region} to be protected. Also, every {@code GeodeRedisServer} will check for entries
* already in the meta data Region.
*/
private void startGemFire() {
- Cache c = GemFireCacheImpl.getInstance();
- if (c == null) {
+ Cache cache = GemFireCacheImpl.getInstance();
+ if (cache == null) {
synchronized (GeodeRedisServer.class) {
- c = GemFireCacheImpl.getInstance();
- if (c == null) {
+ cache = GemFireCacheImpl.getInstance();
+ if (cache == null) {
CacheFactory cacheFactory = new CacheFactory();
if (logLevel != null)
cacheFactory.set(LOG_LEVEL, logLevel);
- c = cacheFactory.create();
+ cache = cacheFactory.create();
}
}
}
- this.cache = c;
- this.logger = c.getLogger();
+ this.cache = cache;
+ this.logger = cache.getLogger();
}
private void initializeRedis() {
@@ -412,7 +420,7 @@ public class GeodeRedisServer {
Region<ByteArrayWrapper, HyperLogLogPlus> hLLRegion;
Region<String, RedisDataType> redisMetaData;
- GemFireCacheImpl gemFireCache = (GemFireCacheImpl) cache;
+ InternalCache gemFireCache = (InternalCache) cache;
try {
if ((stringsRegion = cache.getRegion(STRING_REGION)) == null) {
RegionFactory<ByteArrayWrapper, ByteArrayWrapper> regionFactory =
@@ -611,7 +619,7 @@ public class GeodeRedisServer {
}
/**
- * Shutdown method for {@link GeodeRedisServer}. This closes the {@link Cache}, interrupts all
+ * Shutdown method for {@code GeodeRedisServer}. This closes the {@link Cache}, interrupts all
* execution and forcefully closes all connections.
*/
public synchronized void shutdown() {
@@ -637,7 +645,7 @@ public class GeodeRedisServer {
}
/**
- * Static main method that allows the {@link GeodeRedisServer} to be started from the command
+ * Static main method that allows the {@code GeodeRedisServer} to be started from the command
* line. The supported command line arguments are
* <p>
* -port= <br>
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 5994d7d..1de73a0 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
@@ -54,8 +54,6 @@ import org.apache.geode.redis.GeodeRedisServer;
* because some keys for Redis represented as a {@link Region} in {@link GeodeRedisServer} come with
* additional state. Therefore getting, creating, or destroying a {@link Region} needs to be
* synchronized, which is done away with and abstracted by this class.
- *
- *
*/
public class RegionProvider implements Closeable {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 ab80a36..fd518b9 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
@@ -24,12 +24,11 @@ import org.apache.geode.redis.internal.ExecutionHandlerContext;
import org.apache.geode.redis.internal.RedisDataType;
import org.apache.geode.redis.internal.executor.AbstractExecutor;
-
public abstract class ListExecutor extends AbstractExecutor {
protected static final int LIST_EMPTY_SIZE = 2;
- protected static enum ListDirection {
+ protected enum ListDirection {
LEFT, RIGHT
};
@@ -76,7 +75,7 @@ public abstract class ListExecutor extends AbstractExecutor {
index += pushType == ListDirection.LEFT ? -1 : 1; // Subtract index if left push, add if right
// push
- /**
+ /*
* Multi push command
*
* For every element that needs to be added
@@ -86,7 +85,7 @@ public abstract class ListExecutor extends AbstractExecutor {
byte[] value = commandElems.get(i);
ByteArrayWrapper wrapper = new ByteArrayWrapper(value);
- /**
+ /*
*
* First, use the start index to attempt to insert the value into the Region
*
@@ -101,7 +100,7 @@ public abstract class ListExecutor extends AbstractExecutor {
}
} while (oldValue != null);
- /**
+ /*
*
* Next, update the index in the meta data region. Keep trying to replace the existing index
* unless the index is further out than previously inserted, that's ok. Example below:
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java b/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
index 05ba515..6b0675a 100644
--- a/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
+++ b/geode-core/src/main/java/org/apache/geode/security/AuthInitialize.java
@@ -22,6 +22,7 @@ import org.apache.geode.cache.CacheCallback;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
// TODO Add example usage of this interface and configuration details
/**
@@ -30,7 +31,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
* server/locator side respectively. Implementations should register name of the static creation
* function (that returns an object of the class) as the <i>security-peer-auth-init</i> system
* property on peers and as the <i>security-client-auth-init</i> system property on clients.
- *
+ *
* @since GemFire 5.5
*/
public interface AuthInitialize extends CacheCallback {
@@ -46,6 +47,7 @@ public interface AuthInitialize extends CacheCallback {
*
* @deprecated since Geode 1.0, use init()
*/
+ @Deprecated
public void init(LogWriter systemLogger, LogWriter securityLogger)
throws AuthenticationFailedException;
@@ -53,8 +55,8 @@ public interface AuthInitialize extends CacheCallback {
* @since Geode 1.0. implement this method instead of init with logwriters. Implementation should
* use log4j instead of these loggers.
*/
- default public void init() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ public default void init() {
+ InternalCache cache = GemFireCacheImpl.getInstance();
init(cache.getLogger(), cache.getSecurityLogger());
}
@@ -83,6 +85,7 @@ public interface AuthInitialize extends CacheCallback {
* @deprecated since Geode 1.0, use getCredentials(Properties). When using Integrated security,
* all members, peer/client will use the same credentials.
*/
+ @Deprecated
public Properties getCredentials(Properties securityProps, DistributedMember server,
boolean isPeer) throws AuthenticationFailedException;
@@ -93,7 +96,7 @@ public interface AuthInitialize extends CacheCallback {
* @return the credentials to be used. It needs to contain "security-username" and
* "security-password"
*/
- default public Properties getCredentials(Properties securityProps) {
+ default Properties getCredentials(Properties securityProps) {
return getCredentials(securityProps, null, true);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 f842470..b3bb02b 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
@@ -59,7 +59,7 @@ public class PartitionMessageTest {
when(msg.checkCacheClosing(dm)).thenReturn(false);
when(msg.checkDSClosing(dm)).thenReturn(false);
when(msg.getPartitionedRegion()).thenReturn(pr);
- when(msg.getGemFireCacheImpl()).thenReturn(cache);
+ when(msg.getInternalCache()).thenReturn(cache);
when(msg.getStartPartitionMessageProcessingTime(pr)).thenReturn(startTime);
when(msg.getTXManagerImpl(cache)).thenReturn(txMgr);
@@ -100,7 +100,7 @@ public class PartitionMessageTest {
DataLocationException, InterruptedException, IOException {
txMgr = new TXManagerImpl(null, cache);
when(msg.getPartitionedRegion()).thenReturn(pr);
- when(msg.getGemFireCacheImpl()).thenReturn(cache);
+ when(msg.getInternalCache()).thenReturn(cache);
when(msg.getStartPartitionMessageProcessingTime(pr)).thenReturn(startTime);
when(msg.getTXManagerImpl(cache)).thenReturn(txMgr);
when(msg.canParticipateInTransaction()).thenReturn(true);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index e0dfc6c..6291142 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.cache.execute.Execution;
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.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
@@ -425,7 +426,7 @@ public class DiskStoreCommandsJUnitTest {
}
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.singleton(this.distributedMember);
}
@@ -437,7 +438,7 @@ public class DiskStoreCommandsJUnitTest {
}
@Override
- protected Set<DistributedMember> getNormalMembers(final Cache cache) {
+ protected Set<DistributedMember> getNormalMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.singleton(this.distributedMember);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
index bdb84a9..f2e168a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.cache.execute.Execution;
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.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
@@ -207,7 +208,7 @@ public class IndexCommandsJUnitTest {
}
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.emptySet();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
index c484105..2f13fac 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/ServerCQImpl.java
@@ -44,7 +44,7 @@ import org.apache.geode.cache.query.internal.CompiledSelect;
import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
@@ -216,7 +216,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
}
}
- // this.cqService.addToCqEventKeysMap(this);
this.updateCqCreateStats();
// Initialize the state of CQ.
@@ -283,7 +282,7 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
* @return String modified query.
*/
private Query constructServerSideQuery() throws QueryException {
- GemFireCacheImpl cache = (GemFireCacheImpl) cqService.getCache();
+ InternalCache cache = cqService.getInternalCache();
DefaultQuery locQuery = (DefaultQuery) cache.getLocalQueryService().newQuery(this.queryString);
CompiledSelect select = locQuery.getSimpleSelect();
CompiledIteratorDef from = (CompiledIteratorDef) select.getIterators().get(0);
@@ -371,8 +370,6 @@ public class ServerCQImpl extends CqQueryImpl implements DataSerializable, Serve
if (!CqServiceProvider.MAINTAIN_KEYS) {
return;
}
- // this.logger.fine("Marking key in Results Cache For CQ :" +
- // this.cqName + " key :" + key);
if (this.cqResultKeys != null) {
synchronized (this.cqResultKeys) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
index 8bdef9b..9eada5b 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage.java
@@ -14,32 +14,39 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.lucene.LuceneServiceProvider;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Collection;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.lucene.LuceneServiceProvider;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.logging.LogService;
+
public class DestroyLuceneIndexMessage extends PooledDistributionMessage
implements MessageWithReply {
+ private static final Logger logger = LogService.getLogger();
+
private int processorId;
private String regionPath;
private String indexName;
- private static final Logger logger = LogService.getLogger();
-
/* For serialization */
- public DestroyLuceneIndexMessage() {}
+ public DestroyLuceneIndexMessage() {
+ // nothing
+ }
protected DestroyLuceneIndexMessage(Collection recipients, int processorId, String regionPath,
String indexName) {
@@ -59,7 +66,7 @@ public class DestroyLuceneIndexMessage extends PooledDistributionMessage
+ "; indexName=" + this.indexName);
}
try {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
LuceneServiceImpl impl = (LuceneServiceImpl) LuceneServiceProvider.get(cache);
impl.destroyIndex(this.indexName, this.regionPath, false);
if (logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 e4b4b4f..fa45927 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
@@ -29,6 +29,8 @@ import java.util.Set;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
@@ -650,7 +652,7 @@ public class LuceneIndexCommandsJUnitTest {
}
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
assertSame(getCache(), cache);
return Collections.emptySet();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
index ab8b5b0..0f1a995 100644
--- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
+++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
@@ -443,6 +443,7 @@ public class AutoBalancer implements Declarable {
}
InternalCache getCache() {
+ // TODO: delete this double-checking
if (cache == null) {
synchronized (this) {
if (cache == null) {
@@ -461,6 +462,7 @@ public class AutoBalancer implements Declarable {
@Override
public boolean acquireAutoBalanceLock() {
+ // TODO: delete this double-checking
if (!isLockAcquired.get()) {
synchronized (isLockAcquired) {
if (!isLockAcquired.get()) {
@@ -501,7 +503,7 @@ public class AutoBalancer implements Declarable {
}
}
- private class SystemClockTimeProvider implements TimeProvider {
+ private static class SystemClockTimeProvider implements TimeProvider {
@Override
public long currentTimeMillis() {
return System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
index eb46258..a5c09d3 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImpl.java
@@ -18,19 +18,18 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.GatewayReceiverCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- *
* @since GemFire 7.0
*/
public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
@@ -51,13 +50,13 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
private List<GatewayTransportFilter> filters = new ArrayList<GatewayTransportFilter>();
- private Cache cache;
+ private InternalCache cache;
public GatewayReceiverFactoryImpl() {
-
+ // nothing
}
- public GatewayReceiverFactoryImpl(Cache cache) {
+ public GatewayReceiverFactoryImpl(InternalCache cache) {
this.cache = cache;
}
@@ -116,7 +115,7 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
recv = new GatewayReceiverImpl(this.cache, this.startPort, this.endPort, this.timeBetPings,
this.socketBuffSize, this.bindAdd, this.filters, this.hostnameForSenders,
this.manualStart);
- ((GemFireCacheImpl) cache).addGatewayReceiver(recv);
+ this.cache.addGatewayReceiver(recv);
InternalDistributedSystem system =
(InternalDistributedSystem) this.cache.getDistributedSystem();
system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_CREATE, recv);
@@ -134,7 +133,7 @@ public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
recv = new GatewayReceiverCreation(this.cache, this.startPort, this.endPort,
this.timeBetPings, this.socketBuffSize, this.bindAdd, this.filters,
this.hostnameForSenders, this.manualStart);
- ((CacheCreation) cache).addGatewayReceiver(recv);
+ this.cache.addGatewayReceiver(recv);
}
return recv;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index d953d7f..5e26a46 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -23,16 +23,15 @@ import java.util.List;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -65,12 +64,12 @@ public class GatewayReceiverImpl implements GatewayReceiver {
private CacheServer receiver;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
- public GatewayReceiverImpl(Cache cache, int startPort, int endPort, int timeBetPings,
+ public GatewayReceiverImpl(InternalCache cache, int startPort, int endPort, int timeBetPings,
int buffSize, String bindAdd, List<GatewayTransportFilter> filters, String hostnameForSenders,
boolean manualStart) {
- this.cache = (GemFireCacheImpl) cache;
+ this.cache = cache;
/*
* If user has set hostNameForSenders then it should take precedence over bindAddress. If user
@@ -151,17 +150,17 @@ public class GatewayReceiverImpl implements GatewayReceiver {
receiver.setMaximumTimeBetweenPings(timeBetPings);
receiver.setHostnameForClients(host);
receiver.setBindAddress(bindAdd);
- receiver.setGroups(new String[] {GatewayReceiverImpl.RECEIVER_GROUP});
+ receiver.setGroups(new String[] {GatewayReceiver.RECEIVER_GROUP});
((CacheServerImpl) receiver).setGatewayTransportFilter(this.filters);
try {
- ((CacheServerImpl) receiver).start();
+ receiver.start();
started = true;
} catch (BindException be) {
if (be.getCause() != null
&& be.getCause().getMessage().contains("assign requested address")) {
throw new GatewayReceiverException(
LocalizedStrings.SocketCreator_FAILED_TO_CREATE_SERVER_SOCKET_ON_0_1
- .toLocalizedString(new Object[] {bindAdd, Integer.valueOf(this.port)}));
+ .toLocalizedString(new Object[] {bindAdd, this.port}));
}
// ignore as this port might have been used by other threads.
logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use,
@@ -208,11 +207,6 @@ public class GatewayReceiverImpl implements GatewayReceiver {
LocalizedStrings.GatewayReceiver_IS_NOT_RUNNING.toLocalizedString());
}
receiver.stop();
-
- // InternalDistributedSystem system = ((GemFireCacheImpl) this.cache)
- // .getDistributedSystem();
- // system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_STOP, this);
-
}
public String getHost() {
@@ -237,7 +231,7 @@ public class GatewayReceiverImpl implements GatewayReceiver {
.append("; maximumTimeBetweenPings=").append(getMaximumTimeBetweenPings())
.append("; socketBufferSize=").append(getSocketBufferSize()).append("; isManualStart=")
.append(isManualStart()).append("; group=")
- .append(Arrays.toString(new String[] {GatewayReceiverImpl.RECEIVER_GROUP})).append("]")
+ .append(Arrays.toString(new String[] {GatewayReceiver.RECEIVER_GROUP})).append("]")
.toString();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 8da5613..3eec101 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
@@ -14,38 +14,35 @@
*/
package org.apache.geode.internal.cache.wan;
-
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.geode.GemFireIOException;
-import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.GemFireIOException;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
import org.apache.geode.cache.client.internal.Connection;
+import org.apache.geode.cache.client.internal.SenderProxy;
import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
+import org.apache.geode.internal.cache.tier.sockets.MessageTooLargeException;
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.pdx.PdxRegistryMismatchException;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.cache.client.internal.SenderProxy;
/**
* @since GemFire 7.0
- *
*/
public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDispatcher {
@@ -326,7 +323,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
// Here we might wait on a connection to another server if I was secondary
// so don't start waiting until I am primary
- Cache cache = this.sender.getCache();
+ InternalCache cache = this.sender.getCache();
if (cache != null && !cache.isClosed()) {
if (this.sender.isPrimary() && (this.connection != null)) {
if (this.ackReaderThread == null || !this.ackReaderThread.isRunning()) {
@@ -551,7 +548,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
*/
private volatile boolean shutdown = false;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
private volatile boolean ackReaderThreadRunning = false;
@@ -562,7 +559,7 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
public AckReaderThread(GatewaySender sender, String name) {
super("AckReaderThread for : " + name);
this.setDaemon(true);
- this.cache = (GemFireCacheImpl) ((AbstractGatewaySender) sender).getCache();
+ this.cache = ((AbstractGatewaySender) sender).getCache();
}
public void waitForRunningAckReaderThreadRunningState() {
@@ -671,13 +668,8 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
}
ackReaderThreadRunning = false;
}
-
}
- /**
- * @param exception
- *
- */
protected void logBatchExceptions(BatchException70 exception) {
try {
for (BatchException70 be : exception.getExceptions()) {
@@ -785,7 +777,6 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
} catch (ConnectionDestroyedException e) {
logger.info("AckReader shutting down and connection already destroyed");
}
-
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
index 2c7925b..467c622 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -221,11 +221,6 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
}
if (this.attrs.isParallel()) {
- // if(this.attrs.getDispatcherThreads() != 1){
- // throw new GatewaySenderException(
- // LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_DISPATCHER_THREADS_OTHER_THAN_1
- // .toLocalizedString(id));
- // }
if ((this.attrs.getOrderPolicy() != null)
&& this.attrs.getOrderPolicy().equals(OrderPolicy.THREAD)) {
throw new GatewaySenderException(
@@ -234,14 +229,14 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
}
if (this.cache instanceof GemFireCacheImpl) {
sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
- ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
if (!this.attrs.isManualStart()) {
sender.start();
}
} else if (this.cache instanceof CacheCreation) {
sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
- ((CacheCreation) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
}
} else {
if (this.attrs.getAsyncEventListeners().size() > 0) {
@@ -254,14 +249,14 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
}
if (this.cache instanceof GemFireCacheImpl) {
sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
- ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
if (!this.attrs.isManualStart()) {
sender.start();
}
} else if (this.cache instanceof CacheCreation) {
sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
- ((CacheCreation) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
}
}
return sender;
@@ -287,13 +282,13 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
if (this.cache instanceof GemFireCacheImpl) {
sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
- ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
if (!this.attrs.isManualStart()) {
sender.start();
}
} else if (this.cache instanceof CacheCreation) {
sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
- ((CacheCreation) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
}
} else {
if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
@@ -301,13 +296,13 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
}
if (this.cache instanceof GemFireCacheImpl) {
sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
- ((GemFireCacheImpl) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
if (!this.attrs.isManualStart()) {
sender.start();
}
} else if (this.cache instanceof CacheCreation) {
sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
- ((CacheCreation) this.cache).addGatewaySender(sender);
+ this.cache.addGatewaySender(sender);
}
}
return sender;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index c2d4673..daeeb6f 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -18,6 +18,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -25,7 +26,6 @@ import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
@@ -79,7 +79,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
// Only notify the type registry if this is a WAN gateway queue
if (!isAsyncEventQueue()) {
- ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+ getCache().getPdxRegistry().gatewaySenderStarted(this);
}
new UpdateAttributesProcessor(this).distribute(false);
@@ -135,11 +135,11 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("ParallelGatewaySender{");
- sb.append("id=" + getId());
- sb.append(",remoteDsId=" + getRemoteDSId());
- sb.append(",isRunning =" + isRunning());
+ sb.append("id=").append(getId());
+ sb.append(",remoteDsId=").append(getRemoteDSId());
+ sb.append(",isRunning =").append(isRunning());
sb.append("}");
return sb.toString();
}
@@ -158,7 +158,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
pf.manualStart = isManualStart();
pf.dispatcherThreads = getDispatcherThreads();
pf.orderPolicy = getOrderPolicy();
- for (org.apache.geode.cache.wan.GatewayEventFilter filter : getGatewayEventFilters()) {
+ for (GatewayEventFilter filter : getGatewayEventFilters()) {
pf.eventFiltersClassNames.add(filter.getClass().getName());
}
for (GatewayTransportFilter filter : getGatewayTransportFilters()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index b300460..fe83d60 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
@@ -93,7 +92,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
// Only notify the type registry if this is a WAN gateway queue
if (!isAsyncEventQueue()) {
- ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+ getCache().getPdxRegistry().gatewaySenderStarted(this);
}
new UpdateAttributesProcessor(this).distribute(false);
@@ -178,12 +177,12 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("SerialGatewaySender{");
- sb.append("id=" + getId());
- sb.append(",remoteDsId=" + getRemoteDSId());
- sb.append(",isRunning =" + isRunning());
- sb.append(",isPrimary =" + isPrimary());
+ sb.append("id=").append(getId());
+ sb.append(",remoteDsId=").append(getRemoteDSId());
+ sb.append(",isRunning =").append(isRunning());
+ sb.append(",isPrimary =").append(isPrimary());
sb.append("}");
return sb.toString();
}
[6/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
index e21a834..e0b5ab8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -12,35 +12,44 @@
* 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 java.net.InetAddress;
+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.atomic.AtomicIntegerArray;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.SystemTimer.SystemTimerTask;
import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.CacheClientStatus;
+import org.apache.geode.internal.cache.IncomingGatewayStatus;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.TXId;
+import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.concurrent.ConcurrentHashSet;
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.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.net.InetAddress;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicIntegerArray;
/**
* Class <code>ClientHealthMonitor</code> is a server-side singleton that monitors the health of
* clients by looking at their heartbeats. If too much time elapses between heartbeats, the monitor
* determines that the client is dead and interrupts its threads.
- *
- *
+ *
* @since GemFire 4.2.3
*/
public class ClientHealthMonitor {
@@ -69,7 +78,7 @@ public class ClientHealthMonitor {
/**
* THe GemFire <code>Cache</code>
*/
- final protected Cache _cache;
+ private final InternalCache _cache;
/**
* A thread that validates client connections
@@ -123,7 +132,7 @@ public class ClientHealthMonitor {
* client has died and interrupting its sockets.
* @return The singleton <code>ClientHealthMonitor</code> instance
*/
- public static ClientHealthMonitor getInstance(Cache cache, int maximumTimeBetweenPings,
+ public static ClientHealthMonitor getInstance(InternalCache cache, int maximumTimeBetweenPings,
CacheClientNotifierStats stats) {
createInstance(cache, maximumTimeBetweenPings, stats);
return _instance;
@@ -305,7 +314,7 @@ public class ClientHealthMonitor {
scheduledToBeRemovedTx.removeAll(txids);
}
};
- ((GemFireCacheImpl) this._cache).getCCPTimer().schedule(task, timeout);
+ this._cache.getCCPTimer().schedule(task, timeout);
}
}
}
@@ -384,55 +393,6 @@ public class ClientHealthMonitor {
}
}
- // /**
- // * Returns modifiable map (changes do not effect this class) of memberId
- // * to connection count.
- // */
- // public Map getConnectedClients() {
- // Map map = new HashMap(); // KEY=memberId, VALUE=connectionCount (Integer)
- // synchronized (_clientThreadsLock) {
- // Iterator connectedClients = this._clientThreads.entrySet().iterator();
- // while (connectedClients.hasNext()) {
- // Map.Entry entry = (Map.Entry) connectedClients.next();
- // String memberId = (String) entry.getKey();// memberId includes FQDN
- // Set connections = (Set) entry.getValue();
- // int socketPort = 0;
- // InetAddress socketAddress = null;
- // ///*
- // Iterator serverConnections = connections.iterator();
- // // Get data from one.
- // while (serverConnections.hasNext()) {
- // ServerConnection sc = (ServerConnection) serverConnections.next();
- // socketPort = sc.getSocketPort();
- // socketAddress = sc.getSocketAddress();
- // break;
- // }
- // //*/
- // int connectionCount = connections.size();
- // String clientString = null;
- // if (socketAddress == null) {
- // clientString = "client member id=" + memberId;
- // } else {
- // clientString = "host name=" + socketAddress.toString() + " host ip=" +
- // socketAddress.getHostAddress() + " client port=" + socketPort + " client
- // member id=" + memberId;
- // }
- // map.put(memberId, new Object[] {clientString, new
- // Integer(connectionCount)});
- // /* Note: all client addresses are same...
- // Iterator serverThreads = ((Set) entry.getValue()).iterator();
- // while (serverThreads.hasNext()) {
- // ServerConnection connection = (ServerConnection) serverThreads.next();
- // InetAddress clientAddress = connection.getClientAddress();
- // logger.severe("getConnectedClients: memberId=" + memberId +
- // " clientAddress=" + clientAddress + " FQDN=" +
- // clientAddress.getCanonicalHostName());
- // }*/
- // }
- // }
- // return map;
- // }
-
/**
* Returns modifiable map (changes do not effect this class) of client membershipID to connection
* count. This is different from the map contained in this class as here the key is client
@@ -442,7 +402,6 @@ public class ClientHealthMonitor {
* @param filterProxies Set identifying the Connection proxies which should be fetched. These
* ConnectionProxies may be from same client member or different. If it is null this would
* mean to fetch the Connections of all the ConnectionProxy objects.
- *
*/
public Map getConnectedClients(Set filterProxies) {
Map map = new HashMap(); // KEY=proxyID, VALUE=connectionCount (Integer)
@@ -677,7 +636,6 @@ public class ClientHealthMonitor {
return this._clientHeartbeats;
}
-
/**
* Shuts down the singleton <code>CacheClientNotifier</code> instance.
*/
@@ -693,10 +651,9 @@ public class ClientHealthMonitor {
*
* @param cache The GemFire <code>Cache</code>
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
- * client has died and interrupting its sockets.
*/
- protected static synchronized void createInstance(Cache cache, int maximumTimeBetweenPings,
- CacheClientNotifierStats stats) {
+ protected static synchronized void createInstance(InternalCache cache,
+ int maximumTimeBetweenPings, CacheClientNotifierStats stats) {
refCount++;
if (_instance != null) {
return;
@@ -710,9 +667,8 @@ public class ClientHealthMonitor {
*
* @param cache The GemFire <code>Cache</code>
* @param maximumTimeBetweenPings The maximum time allowed between pings before determining the
- * client has died and interrupting its sockets.
*/
- private ClientHealthMonitor(Cache cache, int maximumTimeBetweenPings,
+ private ClientHealthMonitor(InternalCache cache, int maximumTimeBetweenPings,
CacheClientNotifierStats stats) {
// Set the Cache
this._cache = cache;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 ecd9c7a..6eadee3 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
@@ -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.tier.sockets;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -49,7 +48,7 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.ClientHandShake;
@@ -373,7 +372,7 @@ public class ServerConnection implements Runnable {
return getCache().getDistributedSystem();
}
- public Cache getCache() {
+ public InternalCache getCache() {
return this.crHelper.getCache();
}
@@ -578,7 +577,7 @@ public class ServerConnection implements Runnable {
private boolean isFiringMembershipEvents() {
return this.acceptor.isRunning()
- && !((GemFireCacheImpl) this.acceptor.getCachedRegionHelper().getCache()).isClosed()
+ && !(this.acceptor.getCachedRegionHelper().getCache()).isClosed()
&& !acceptor.getCachedRegionHelper().getCache().getCancelCriterion().isCancelInProgress();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
index 5a02525..1b599e9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxEnum.java
@@ -12,16 +12,13 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -30,7 +27,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class AddPdxEnum extends BaseCommand {
private static final Logger logger = LogService.getLogger();
@@ -56,7 +52,7 @@ public class AddPdxEnum extends BaseCommand {
int enumId = msg.getPart(1).getInt();
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
registry.addRemoteEnum(enumId, enumInfo);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
index 9c01e05..9b8302e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/AddPdxType.java
@@ -12,18 +12,14 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
-import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
@@ -31,7 +27,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class AddPdxType extends BaseCommand {
private static final Logger logger = LogService.getLogger();
@@ -61,7 +56,7 @@ public class AddPdxType extends BaseCommand {
// client side.
type.setTypeId(typeId);
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
registry.addRemoteType(typeId, type);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
index 84e5bd0..e63ac22 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -26,9 +26,8 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.operations.ExecuteFunctionOperationContext;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.MemoryThresholds;
@@ -155,7 +154,7 @@ public class ExecuteFunction extends BaseCommand {
logger.debug("Executing Function on Server: " + servConn.toString() + "with context :"
+ context.toString());
}
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
HeapMemoryMonitor hmm =
((InternalResourceManager) cache.getResourceManager()).getHeapMonitor();
if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical()
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 102e8e8..8fafd10 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -26,9 +26,8 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.operations.ExecuteFunctionOperationContext;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.MemoryThresholds;
@@ -183,7 +182,7 @@ public class ExecuteFunction65 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("Executing Function on Server: {} with context: {}", servConn, context);
}
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
HeapMemoryMonitor hmm =
((InternalResourceManager) cache.getResourceManager()).getHeapMonitor();
if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical()
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
index 86b2466..d007777 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -36,6 +36,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.control.HeapMemoryMonitor;
@@ -220,7 +221,7 @@ public class ExecuteFunction66 extends BaseCommand {
if (logger.isDebugEnabled()) {
logger.debug("Executing Function on Server: {} with context: {}", servConn, context);
}
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
HeapMemoryMonitor hmm =
((InternalResourceManager) cache.getResourceManager()).getHeapMonitor();
if (functionObject.optimizeForWrite() && cache != null && hmm.getState().isCritical()
@@ -329,14 +330,14 @@ public class ExecuteFunction66 extends BaseCommand {
.toString(fn.getId()));
}
} else {
- /**
+ /*
* if dm is null it mean cache is also null. Transactional function without cache cannot be
* executed.
*/
final TXStateProxy txState = TXManagerImpl.getCurrentTXState();
Runnable functionExecution = new Runnable() {
public void run() {
- GemFireCacheImpl cache = null;
+ InternalCache cache = null;
try {
if (txState != null) {
cache = GemFireCacheImpl.getExisting("executing function");
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index 2ccca76..09f56f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.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.tier.sockets.command;
import java.io.IOException;
@@ -31,12 +28,13 @@ import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.i18n.StringId;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.EventIDHolder;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
@@ -58,7 +56,6 @@ import org.apache.geode.pdx.internal.EnumId;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import org.apache.geode.i18n.StringId;
public class GatewayReceiverCommand extends BaseCommand {
@@ -71,8 +68,8 @@ public class GatewayReceiverCommand extends BaseCommand {
private GatewayReceiverCommand() {}
private void handleRegionNull(ServerConnection servConn, String regionName, int batchId) {
- GemFireCacheImpl gfc = (GemFireCacheImpl) servConn.getCachedRegionHelper().getCache();
- if (gfc != null && gfc.isCacheAtShutdownAll()) {
+ InternalCache cache = servConn.getCachedRegionHelper().getCache();
+ if (cache != null && cache.isCacheAtShutdownAll()) {
throw new CacheClosedException("Shutdown occurred during message processing");
} else {
String reason = LocalizedStrings.ProcessBatch_WAS_NOT_FOUND_DURING_BATCH_CREATE_REQUEST_0
@@ -808,12 +805,10 @@ public class GatewayReceiverCommand extends BaseCommand {
if (key instanceof EnumId) {
EnumId enumId = (EnumId) key;
value = BlobHelper.deserializeBlob((byte[]) value);
- ((GemFireCacheImpl) crHelper.getCache()).getPdxRegistry().addRemoteEnum(enumId.intValue(),
- (EnumInfo) value);
+ crHelper.getCache().getPdxRegistry().addRemoteEnum(enumId.intValue(), (EnumInfo) value);
} else {
value = BlobHelper.deserializeBlob((byte[]) value);
- ((GemFireCacheImpl) crHelper.getCache()).getPdxRegistry().addRemoteType((int) key,
- (PdxType) value);
+ crHelper.getCache().getPdxRegistry().addRemoteType((int) key, (PdxType) value);
}
return true;
}
@@ -867,7 +862,6 @@ public class GatewayReceiverCommand extends BaseCommand {
servConn.getName()), be);
}
}
-
}
private static void writeFatalException(Message origMsg, Throwable exception,
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
index 72e375c..54a21ed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXEnumById.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.tier.sockets.command;
import java.io.IOException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -28,7 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class GetPDXEnumById extends BaseCommand {
private final static GetPDXEnumById singleton = new GetPDXEnumById();
@@ -51,7 +47,7 @@ public class GetPDXEnumById extends BaseCommand {
EnumInfo result;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
result = registry.getEnumInfoById(enumId);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
index 25bfe3d..1b21383 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForEnum.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.tier.sockets.command;
import java.io.IOException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -28,7 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class GetPDXIdForEnum extends BaseCommand {
private final static GetPDXIdForEnum singleton = new GetPDXIdForEnum();
@@ -52,7 +48,7 @@ public class GetPDXIdForEnum extends BaseCommand {
int enumId;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
enumId = registry.defineEnum(enumInfo);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
index 3c80c76..2054196 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXIdForType.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.tier.sockets.command;
import java.io.IOException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -28,7 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class GetPDXIdForType extends BaseCommand {
private final static GetPDXIdForType singleton = new GetPDXIdForType();
@@ -53,7 +49,7 @@ public class GetPDXIdForType extends BaseCommand {
int pdxId;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
pdxId = registry.defineType(type);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
index 603d3d0..2470893 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPDXTypeById.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.tier.sockets.command;
import java.io.IOException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -28,7 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-
public class GetPDXTypeById extends BaseCommand {
private final static GetPDXTypeById singleton = new GetPDXTypeById();
@@ -51,7 +47,7 @@ public class GetPDXTypeById extends BaseCommand {
PdxType type;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
TypeRegistry registry = cache.getPdxRegistry();
type = registry.getType(pdxId);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
index ca3d559..19551c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxEnums70.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import java.util.Map;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -46,7 +46,7 @@ public class GetPdxEnums70 extends BaseCommand {
Map<Integer, EnumInfo> enums;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
enums = cache.getPdxRegistry().enumMap();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
index 8b73ed7..cc96b8e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetPdxTypes70.java
@@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
import java.util.Map;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
@@ -46,7 +46,7 @@ public class GetPdxTypes70 extends BaseCommand {
Map<Integer, PdxType> types;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
types = cache.getPdxRegistry().typeMap();
} catch (Exception e) {
writeException(msg, e, false, servConn);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
index 54235c1..d3c0393 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query.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.tier.sockets.command;
import java.io.IOException;
@@ -29,7 +26,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommandQuery;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -65,7 +61,6 @@ public class Query extends BaseCommandQuery {
servConn.setRequestSpecificTimeout(timeout);
}
-
if (logger.isDebugEnabled()) {
logger.debug("{}: Received query request from {} queryString: {}", servConn.getName(),
servConn.getSocketString(), queryString);
@@ -73,7 +68,7 @@ public class Query extends BaseCommandQuery {
try {
// Create query
QueryService queryService =
- ((GemFireCacheImpl) servConn.getCachedRegionHelper().getCache()).getLocalQueryService();
+ servConn.getCachedRegionHelper().getCache().getLocalQueryService();
org.apache.geode.cache.query.Query query = queryService.newQuery(queryString);
Set regionNames = ((DefaultQuery) query).getRegionsInQuery(null);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
index 4e30039..5849431 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Query651.java
@@ -12,26 +12,26 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.geode.cache.operations.QueryOperationContext;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
import org.apache.geode.cache.query.types.CollectionType;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.MessageType;
-import org.apache.geode.internal.cache.tier.sockets.*;
+import org.apache.geode.internal.cache.tier.sockets.BaseCommandQuery;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
+import org.apache.geode.internal.cache.tier.sockets.Message;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
-import org.apache.geode.cache.operations.QueryOperationContext;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.internal.DefaultQuery;
-import org.apache.geode.cache.query.QueryInvalidException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
public class Query651 extends BaseCommandQuery {
@@ -92,7 +92,7 @@ public class Query651 extends BaseCommandQuery {
try {
// Create query
QueryService queryService =
- ((GemFireCacheImpl) servConn.getCachedRegionHelper().getCache()).getLocalQueryService();
+ servConn.getCachedRegionHelper().getCache().getLocalQueryService();
org.apache.geode.cache.query.Query query = null;
if (queryParams != null) {
@@ -138,6 +138,4 @@ public class Query651 extends BaseCommandQuery {
protected CollectionType getCollectionType(SelectResults selectResults) {
return new CollectionTypeImpl(List.class, selectResults.getCollectionType().getElementType());
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
index a085353..3fd84d6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -16,10 +16,8 @@ package org.apache.geode.internal.cache.tier.sockets.command;
import java.io.IOException;
-import org.apache.geode.LogWriter;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.ha.HAContainerWrapper;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
index e324a7f..72eab50 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommand.java
@@ -14,21 +14,26 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
+import java.io.IOException;
+
import org.apache.geode.cache.TransactionDataNodeHasDepartedException;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.WaitForViewInstallation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.FindRemoteTXMessage;
import org.apache.geode.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReplyProcessor;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.PeerTXStateStub;
+import org.apache.geode.internal.cache.TXId;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.sockets.BaseCommand;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import java.io.IOException;
-
/**
* Used for bootstrapping txState/PeerTXStateStub on the server. This command is send when in client
* in a transaction is about to failover to this server
@@ -91,7 +96,7 @@ public class TXFailoverCommand extends BaseCommand {
// bug #42228 and bug #43504 - this cannot return until the current view
// has been installed by all members, so that dlocks are released and
// the same keys can be used in a new transaction by the same client thread
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
try {
WaitForViewInstallation.send((DistributionManager) cache.getDistributionManager());
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
index 8a1f8b1..ded789e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.internal.cache.tx;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.transaction.Status;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.TransactionDataNodeHasDepartedException;
import org.apache.geode.cache.TransactionException;
@@ -26,30 +34,22 @@ 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.cache.*;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.TXCommitMessage;
+import org.apache.geode.internal.cache.TXLockRequest;
+import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
+import org.apache.geode.internal.cache.TXStateProxy;
+import org.apache.geode.internal.cache.TXStateStub;
import org.apache.geode.internal.cache.locks.TXRegionLockRequest;
import org.apache.geode.internal.cache.tx.TransactionalOperation.ServerRegionOperation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import javax.transaction.Status;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
public class ClientTXStateStub extends TXStateStub {
private static final Logger logger = LogService.getLogger();
- // /** a flag to turn off automatic replay of transactions. Maybe this should be a pool property?
- // */
- // private static final boolean ENABLE_REPLAY =
- // Boolean.getBoolean("gemfire.enable-transaction-replay");
- //
- // /** time to pause between transaction replays, in millis */
- // private static final int TRANSACTION_REPLAY_PAUSE =
- // Integer.getInteger("gemfire.transaction-replay-pause", 500).intValue();
-
/** test hook - used to find out what operations were performed in the last tx */
private static ThreadLocal<List<TransactionalOperation>> recordedTransactionalOperations = null;
@@ -91,8 +91,6 @@ public class ClientTXStateStub extends TXStateStub {
recordedTransactionalOperations = t;
}
-
-
public ClientTXStateStub(TXStateProxy stateProxy, DistributedMember target,
LocalRegion firstRegion) {
super(stateProxy, target);
@@ -124,7 +122,7 @@ public class ClientTXStateStub extends TXStateStub {
*/
private void obtainLocalLocks() {
lockReq = new TXLockRequest();
- GemFireCacheImpl cache = GemFireCacheImpl.getExisting("");
+ InternalCache cache = GemFireCacheImpl.getExisting("");
for (TransactionalOperation txOp : this.recordedOperations) {
if (ServerRegionOperation.lockKeyForTx(txOp.getOperation())) {
TXRegionLockRequest rlr = lockReq.getRegionLockRequest(txOp.getRegionName());
@@ -160,7 +158,7 @@ public class ClientTXStateStub extends TXStateStub {
this.internalAfterSendCommit.run();
}
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache == null) {
// fixes bug 42933
return;
@@ -177,7 +175,6 @@ public class ClientTXStateStub extends TXStateStub {
txcm.basicProcess();
}
-
@Override
protected TXRegionStub generateRegionStub(LocalRegion region) {
return new ClientTXRegionStub(region);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
index 1aed187..6df6eb9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
@@ -30,16 +30,13 @@ import org.apache.geode.internal.cache.DistributedRemoveAllOperation.RemoveAllEn
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllEntryData;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.annotations.Retained;
-/**
- *
- *
- */
public class DistTxEntryEvent extends EntryEventImpl {
protected static final byte HAS_PUTALL_OP = 0x1;
@@ -100,7 +97,7 @@ public class DistTxEntryEvent extends EntryEventImpl {
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
this.eventID = (EventID) DataSerializer.readObject(in);
String regionName = DataSerializer.readString(in);
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
this.region = (LocalRegion) cache.getRegion(regionName);
this.op = Operation.fromOrdinal(in.readByte());
Object key = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 832391d..fd128c3 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
@@ -24,17 +24,12 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.execute.BucketMovedException;
-import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
+import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -61,13 +56,16 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.HasCachePerfStats;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.RegionQueue;
+import org.apache.geode.internal.cache.execute.BucketMovedException;
+import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
+import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator;
import org.apache.geode.internal.cache.wan.serial.ConcurrentSerialGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -520,7 +518,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
this.getLifeCycleLock().writeLock().lock();
// first, check if this sender is attached to any region. If so, throw
// GatewaySenderException
- Set<LocalRegion> regions = ((GemFireCacheImpl) this.cache).getApplicationRegions();
+ Set<LocalRegion> regions = this.cache.getApplicationRegions();
Iterator regionItr = regions.iterator();
while (regionItr.hasNext()) {
LocalRegion region = (LocalRegion) regionItr.next();
@@ -541,7 +539,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
// remove the sender from the cache
- ((GemFireCacheImpl) this.cache).removeGatewaySender(this);
+ this.cache.removeGatewaySender(this);
// destroy the region underneath the sender's queue
if (initiator) {
@@ -816,7 +814,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return true;
}
-
public void distribute(EnumListenerEvent operation, EntryEventImpl event,
List<Integer> allRemoteDSIds) {
@@ -981,7 +978,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
}
-
/**
* During sender is getting started, if there are any cache operation on queue then that event
* will be stored in temp queue. Once sender is started, these event from tmp queue will be added
@@ -1100,8 +1096,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
boolean gotLock = false;
try {
// Obtain the distributed lock
- gotLock = ((GemFireCacheImpl) getCache()).getGatewaySenderLockService()
- .lock(META_DATA_REGION_NAME, -1, -1);
+ gotLock = getCache().getGatewaySenderLockService().lock(META_DATA_REGION_NAME, -1, -1);
if (!gotLock) {
throw new IllegalStateException(
LocalizedStrings.AbstractGatewaySender_FAILED_TO_LOCK_META_REGION_0
@@ -1143,7 +1138,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
} finally {
// Unlock the lock if necessary
if (gotLock) {
- ((GemFireCacheImpl) getCache()).getGatewaySenderLockService().unlock(META_DATA_REGION_NAME);
+ getCache().getGatewaySenderLockService().unlock(META_DATA_REGION_NAME);
if (isDebugEnabled) {
logger.debug("{}: Unlocked the metadata region", this);
}
@@ -1161,7 +1156,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
@SuppressWarnings({"rawtypes", "unchecked", "deprecation"})
private static synchronized Region<String, Integer> initializeEventIdIndexMetaDataRegion(
AbstractGatewaySender sender) {
- final Cache cache = sender.getCache();
+ final InternalCache cache = sender.getCache();
Region<String, Integer> region = cache.getRegion(META_DATA_REGION_NAME);
if (region == null) {
// Create region attributes (must be done this way to use InternalRegionArguments)
@@ -1183,7 +1178,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
// Create the region
try {
- region = ((GemFireCacheImpl) cache).createVMRegion(META_DATA_REGION_NAME, ra, ira);
+ region = cache.createVMRegion(META_DATA_REGION_NAME, ra, ira);
} catch (RegionExistsException e) {
region = cache.getRegion(META_DATA_REGION_NAME);
} catch (Exception e) {
@@ -1216,7 +1211,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
}
-
public int getTmpQueuedEventSize() {
if (tmpQueuedEvents != null) {
return tmpQueuedEvents.size();
@@ -1300,8 +1294,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
* allows us to defer creation of the GatewaySenderEventImpl until we are ready to actually
* enqueue it. The caller is responsible for giving us an EntryEventImpl that we own and that we
* will release. This is done by making a copy/clone of the original event. This fixes bug 52029.
- *
- *
*/
public static class TmpQueueEvent implements Releasable {
private final EnumListenerEvent operation;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 dfbd664..1572e37 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
@@ -14,15 +14,42 @@
*/
package org.apache.geode.internal.cache.wan;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayQueueEvent;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.Conflatable;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueue;
@@ -31,13 +58,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
/**
* EventProcessor responsible for peeking from queue and handling over the events to the dispatcher.
@@ -46,7 +66,6 @@ import java.util.concurrent.ConcurrentHashMap;
* GatewaySenderEventRemoteDispatcher or GatewaySenderEventCallbackDispatcher.
*
* @since GemFire 7.0
- *
*/
public abstract class AbstractGatewaySenderEventProcessor extends Thread {
@@ -391,7 +410,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
// list of filteredList + pdxEventsToBeDispatched events
List<GatewaySenderEventImpl> eventsToBeDispatched = new ArrayList<GatewaySenderEventImpl>();
-
for (;;) {
if (stopped()) {
break;
@@ -426,7 +444,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
// filtering VERSION_ACTION events from being sent.
boolean sendUpdateVersionEvents = shouldSendVersionEvents(this.dispatcher);
-
// sleep a little bit, look for events
boolean interrupted = Thread.interrupted();
try {
@@ -435,7 +452,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
resetLastPeekedEvents = false;
}
-
{
// Below code was added to consider the case of queue region is
// destroyed due to userPRs localdestroy or destroy operation.
@@ -761,7 +777,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
List<GatewaySenderEventImpl> pdxEventsToBeDispatched = new ArrayList<GatewaySenderEventImpl>();
// getPDXRegion
- GemFireCacheImpl cache = (GemFireCacheImpl) this.sender.getCache();
+ InternalCache cache = this.sender.getCache();
Region<Object, Object> pdxRegion = cache.getRegion(PeerTypeRegistration.REGION_NAME);
if (rebuildPdxList) {
@@ -782,7 +798,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
EntryEventImpl event = EntryEventImpl.create((LocalRegion) pdxRegion, Operation.UPDATE,
typeEntry.getKey(), typeEntry.getValue(), null, false, cache.getMyId());
event.disallowOffHeapValues();
- event.setEventId(new EventID(cache.getSystem()));
+ event.setEventId(new EventID(cache.getInternalDistributedSystem()));
List<Integer> allRemoteDSIds = new ArrayList<Integer>();
for (GatewaySender sender : cache.getGatewaySenders()) {
allRemoteDSIds.add(sender.getRemoteDSId());
@@ -805,7 +821,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
}
}
-
Iterator<GatewaySenderEventImpl> iterator = pdxSenderEventsList.iterator();
while (iterator.hasNext()) {
GatewaySenderEventImpl pdxEvent = iterator.next();
@@ -838,7 +853,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
* @param remotePdxSize
*/
public void checkIfPdxNeedsResend(int remotePdxSize) {
- GemFireCacheImpl cache = (GemFireCacheImpl) this.sender.getCache();
+ InternalCache cache = this.sender.getCache();
Region<Object, Object> pdxRegion = cache.getRegion(PeerTypeRegistration.REGION_NAME);
// The peer has not seen all of our PDX types. This may be because
@@ -976,7 +991,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
}
eventQueueRemove(events.size());
}
-
}
public void handleUnSuccessBatchAck(int bId) {
@@ -1014,7 +1028,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
}
}
-
public abstract void initializeEventDispatcher();
public GatewaySenderEventDispatcher getDispatcher() {
@@ -1248,11 +1261,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
((ParallelGatewaySenderQueue) this.queue).clear(pr, bucketId);
}
- /*
- * public int size(PartitionedRegion pr, int bucketId) throws ForceReattemptException { return
- * ((ParallelGatewaySenderQueue)this.queue).size(pr, bucketId); }
- */
-
public void notifyEventProcessorIfRequired(int bucketId) {
((ParallelGatewaySenderQueue) this.queue).notifyEventProcessorIfRequired();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 c831b26..9472792 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
@@ -28,8 +28,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
+import org.apache.geode.cache.util.Gateway;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.DistributedLockService;
@@ -44,6 +44,7 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -148,12 +149,6 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
.toString(new Object[] {sp.Id, sp.manualStart, sender.isManualStart()}));
}
}
- /*
- * if(sp.dispatcherThreads != sender.getDispatcherThreads()) { throw new IllegalStateException(
- * LocalizedStrings.
- * GatewaySenderAdvisor_CANNOT_CREATE_GATEWAYSENDER_0_WITH_DISPATCHER_THREAD_1_BECAUSE_ANOTHER_CACHE_HAS_THE_SAME_SENDER_WITH_DISPATCHER_THREAD_2
- * .toString(new Object[] { sp.Id, sp.dispatcherThreads, sender.getDispatcherThreads() })); }
- */
if (!sp.isParallel) {
if (sp.orderPolicy != sender.getOrderPolicy()) {
@@ -232,9 +227,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
* if there are no other primary senders then this sender should volunteer for primary. 2. If this
* sender is primary and its policy is secondary then this sender should release the lock so that
* other primary sender which s waiting on lock will get the lock.
- *
*/
-
@Override
public void profileUpdated(Profile profile) {
if (profile instanceof GatewaySenderProfile) {
@@ -299,8 +292,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
}
public void initDLockService() {
- InternalDistributedSystem ds =
- ((GemFireCacheImpl) this.sender.getCache()).getInternalDistributedSystem();
+ InternalDistributedSystem ds = this.sender.getCache().getInternalDistributedSystem();
String dlsName = getDLockServiceName();
this.lockService = DistributedLockService.getServiceNamed(dlsName);
if (this.lockService == null) {
@@ -560,8 +552,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
this.isDiskSynchronous = in.readBoolean();
this.dispatcherThreads = in.readInt();
if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.CURRENT) < 0) {
- org.apache.geode.cache.util.Gateway.OrderPolicy oldOrderPolicy =
- DataSerializer.readObject(in);
+ Gateway.OrderPolicy oldOrderPolicy = DataSerializer.readObject(in);
if (oldOrderPolicy != null) {
if (oldOrderPolicy.name().equals(OrderPolicy.KEY.name())) {
this.orderPolicy = OrderPolicy.KEY;
@@ -604,14 +595,12 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.CURRENT) < 0
&& this.orderPolicy != null) {
String orderPolicyName = this.orderPolicy.name();
- if (orderPolicyName.equals(org.apache.geode.cache.util.Gateway.OrderPolicy.KEY.name())) {
- DataSerializer.writeObject(org.apache.geode.cache.util.Gateway.OrderPolicy.KEY, out);
- } else if (orderPolicyName
- .equals(org.apache.geode.cache.util.Gateway.OrderPolicy.THREAD.name())) {
- DataSerializer.writeObject(org.apache.geode.cache.util.Gateway.OrderPolicy.THREAD, out);
+ if (orderPolicyName.equals(Gateway.OrderPolicy.KEY.name())) {
+ DataSerializer.writeObject(Gateway.OrderPolicy.KEY, out);
+ } else if (orderPolicyName.equals(Gateway.OrderPolicy.THREAD.name())) {
+ DataSerializer.writeObject(Gateway.OrderPolicy.THREAD, out);
} else {
- DataSerializer.writeObject(org.apache.geode.cache.util.Gateway.OrderPolicy.PARTITION,
- out);
+ DataSerializer.writeObject(Gateway.OrderPolicy.PARTITION, out);
}
} else {
DataSerializer.writeObject(orderPolicy, out);
@@ -699,10 +688,9 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
@Override
public void processIncoming(DistributionManager dm, String adviseePath, boolean removeProfile,
boolean exchangeProfiles, final List<Profile> replyProfiles) {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null) {
- AbstractGatewaySender sender =
- (AbstractGatewaySender) ((GemFireCacheImpl) cache).getGatewaySender(adviseePath);
+ AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(adviseePath);
handleDistributionAdvisee(sender, removeProfile, exchangeProfiles, replyProfiles);
}
}
@@ -714,7 +702,6 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
sb.append("; remoteDSName=" + this.remoteDSId);
sb.append("; isRunning=" + this.isRunning);
sb.append("; isPrimary=" + this.isPrimary);
-
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
index ffe7ae0..ed6df0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
@@ -34,15 +34,12 @@ import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.wan.GatewayQueueEvent;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
-import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
import org.apache.geode.internal.cache.wan.GatewaySenderEventDispatcher;
import org.apache.geode.internal.cache.wan.GatewaySenderException;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -58,8 +55,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
* The {@link ParallelGatewaySenderQueue} should be shared among all the
* {@link ParallelGatewaySenderEventProcessor}s.
- *
- *
*/
public class ConcurrentParallelGatewaySenderEventProcessor
extends AbstractGatewaySenderEventProcessor {
@@ -67,8 +62,9 @@ public class ConcurrentParallelGatewaySenderEventProcessor
protected static final Logger logger = LogService.getLogger();
protected ParallelGatewaySenderEventProcessor processors[];
- // private final List<ConcurrentParallelGatewaySenderQueue> concurrentParallelQueues;
+
private GemFireException ex = null;
+
final int nDispatcher;
public ConcurrentParallelGatewaySenderEventProcessor(AbstractGatewaySender sender) {
@@ -94,8 +90,7 @@ public class ConcurrentParallelGatewaySenderEventProcessor
// gets the remaining
// bucket
Set<Region> targetRs = new HashSet<Region>();
- for (LocalRegion pr : ((GemFireCacheImpl) ((AbstractGatewaySender) sender).getCache())
- .getApplicationRegions()) {
+ for (LocalRegion pr : sender.getCache().getApplicationRegions()) {
if (pr.getAllGatewaySenderIds().contains(sender.getId())) {
targetRs.add(pr);
}
@@ -124,17 +119,7 @@ public class ConcurrentParallelGatewaySenderEventProcessor
@Override
protected void initializeMessageQueue(String id) {
- /*
- * Set<Region> targetRs = new HashSet<Region>(); for (LocalRegion pr :
- * ((GemFireCacheImpl)((ParallelGatewaySenderImpl)sender) .getCache()).getApplicationRegions())
- * { if (pr.getAllGatewaySenderIds().contains(id)) { targetRs.add(pr); } }
- */
- // this.parallelQueue = new ParallelGatewaySenderQueue(this.sender, targetRs);
- /*
- * if (sender.getIsHDFSQueue()) this.parallelQueue = new
- * HDFSParallelGatewaySenderQueue(this.sender, targetRs); else this.parallelQueue = new
- * ParallelGatewaySenderQueue(this.sender, targetRs);
- */
+ // nothing
}
@Override
@@ -148,14 +133,6 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
int pId = bucketId % this.nDispatcher;
this.processors[pId].enqueueEvent(operation, event, substituteValue);
-
- /*
- * if (getSender().beforeEnqueue(gatewayQueueEvent)) { long start =
- * getSender().getStatistics().startTime(); try { this.parallelQueue.put(gatewayQueueEvent); }
- * catch (InterruptedException e) { e.printStackTrace(); } finally { if (gatewayQueueEvent !=
- * null) { gatewayQueueEvent.release(); } getSender().getStatistics().endPut(start); } else {
- * getSender().getStatistics().incEventsFiltered(); }
- */
}
@Override
@@ -196,7 +173,6 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
}
-
private void waitForRunningStatus() {
for (ParallelGatewaySenderEventProcessor parallelProcessor : this.processors) {
synchronized (parallelProcessor.runningStateLock) {
@@ -218,7 +194,6 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
}
-
@Override
public void stopProcessing() {
if (!this.isAlive()) {
@@ -299,7 +274,6 @@ public class ConcurrentParallelGatewaySenderEventProcessor
for (ParallelGatewaySenderEventProcessor parallelProcessor : this.processors) {
parallelProcessor.waitForDispatcherToPause();
}
- // super.waitForDispatcherToPause();
}
@Override
@@ -330,24 +304,12 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
return l;
}
- /*
- * public List<ConcurrentParallelGatewaySenderQueue> getConcurrentParallelQueues() { return
- * concurrentParallelQueues; }
- */
@Override
public RegionQueue getQueue() {
return this.queue;
}
- /*
- * public Set<PartitionedRegion> getRegions() { return
- * ((ParallelGatewaySenderQueue)(processors[0].getQueue())).getRegions(); }
- *
- * public int localSize() { return
- * ((ParallelGatewaySenderQueue)(processors[0].getQueue())).localSize(); }
- */
-
@Override
public GatewaySenderEventDispatcher getDispatcher() {
return this.processors[0].getDispatcher();// Suranjan is that fine??
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
index faf7836..e74270f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
@@ -12,47 +12,32 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-/**
- *
- */
package org.apache.geode.internal.cache.wan.parallel;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+import java.util.concurrent.BlockingQueue;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.wan.GatewayQueueEvent;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.internal.cache.ForceReattemptException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.size.SingleObjectSizer;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-
-
-/**
- *
- */
public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEventProcessor {
private static final Logger logger = LogService.getLogger();
@@ -80,7 +65,6 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
"Event Processor for GatewaySender_" + sender.getId() + "_" + id, sender);
this.index = id;
this.nDispatcher = nDispatcher;
- // this.queue = new ParallelGatewaySenderQueue(sender, userRegions, id, nDispatcher);
initializeMessageQueue(sender.getId());
setDaemon(true);
}
@@ -88,8 +72,7 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
@Override
protected void initializeMessageQueue(String id) {
Set<Region> targetRs = new HashSet<Region>();
- for (LocalRegion region : ((GemFireCacheImpl) ((AbstractGatewaySender) sender).getCache())
- .getApplicationRegions()) {
+ for (LocalRegion region : sender.getCache().getApplicationRegions()) {
if (region.getAllGatewaySenderIds().contains(id)) {
targetRs.add(region);
}
@@ -128,12 +111,7 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
return;
}
- // TODO : Kishor : Looks like for PDX region bucket id is set to -1.
- // int bucketId = -1;
- // if (!(region instanceof DistributedRegion && ((DistributedRegion)region)
- // .isPdxTypesRegion())) {
- // bucketId = PartitionedRegionHelper.getHashKey(event);
- // }
+ // TODO: Looks like for PDX region bucket id is set to -1.
boolean queuedEvent = false;
try {
EventID eventID = ((EntryEventImpl) event).getEventId();
@@ -143,7 +121,6 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
gatewayQueueEvent = new GatewaySenderEventImpl(operation, event, substituteValue, true,
eventID.getBucketID());
-
if (getSender().beforeEnqueue(gatewayQueueEvent)) {
long start = getSender().getStatistics().startTime();
try {
@@ -170,11 +147,6 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
((ParallelGatewaySenderQueue) this.queue).clear(pr, bucketId);
}
- /*
- * public int size(PartitionedRegion pr, int bucketId) throws ForceReattemptException { return
- * ((ParallelGatewaySenderQueue)this.queue).size(pr, bucketId); }
- */
-
public void notifyEventProcessorIfRequired(int bucketId) {
((ParallelGatewaySenderQueue) this.queue).notifyEventProcessorIfRequired();
}
@@ -196,19 +168,16 @@ public class ParallelGatewaySenderEventProcessor extends AbstractGatewaySenderEv
}
public void addShadowPartitionedRegionForUserPR(PartitionedRegion pr) {
- // TODO Auto-generated method stub
((ParallelGatewaySenderQueue) this.queue).addShadowPartitionedRegionForUserPR(pr);
}
public void addShadowPartitionedRegionForUserRR(DistributedRegion userRegion) {
- // TODO Auto-generated method stub
((ParallelGatewaySenderQueue) this.queue).addShadowPartitionedRegionForUserRR(userRegion);
}
@Override
protected void rebalance() {
// No operation for AsyncEventQueuerProcessor
-
}
@Override
[7/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
Change GemFireCacheImpl to InternalCache
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bccdb56e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bccdb56e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bccdb56e
Branch: refs/heads/feature/GEODE-2632-12
Commit: bccdb56e2752b644b6180ceee567deafcaf27fe2
Parents: 0c36d5f
Author: Kirk Lund <kl...@apache.org>
Authored: Fri May 5 10:32:10 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri May 5 10:32:10 2017 -0700
----------------------------------------------------------------------
...erConfigurationServiceEndToEndDUnitTest.java | 6 +-
.../web/controllers/AddFreeItemToOrders.java | 38 ++-
.../RestAPIsAndInterOpsDUnitTest.java | 10 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 13 +-
.../geode/internal/cache/GemFireCacheImpl.java | 12 +
.../geode/internal/cache/InternalCache.java | 28 +++
.../geode/internal/cache/lru/HeapEvictor.java | 8 +-
.../cache/lru/HeapLRUCapacityController.java | 20 +-
.../internal/cache/lru/OffHeapEvictor.java | 7 +-
.../cache/partitioned/PartitionMessage.java | 11 +-
.../PartitionedRegionRebalanceOp.java | 35 ++-
.../rebalance/PartitionedRegionLoadModel.java | 19 --
.../cache/persistence/BackupManager.java | 42 ++--
.../snapshot/CacheSnapshotServiceImpl.java | 7 +-
.../internal/cache/snapshot/GFSnapshot.java | 10 +-
.../internal/cache/tier/CachedRegionHelper.java | 1 -
.../cache/tier/InternalClientMembership.java | 4 +-
.../cache/tier/sockets/AcceptorImpl.java | 26 +-
.../cache/tier/sockets/BaseCommand.java | 60 +++--
.../cache/tier/sockets/CacheClientNotifier.java | 30 +--
.../cache/tier/sockets/CacheClientProxy.java | 24 +-
.../cache/tier/sockets/CacheClientUpdater.java | 137 +++++------
.../cache/tier/sockets/ClientHealthMonitor.java | 94 ++-----
.../cache/tier/sockets/ServerConnection.java | 7 +-
.../cache/tier/sockets/command/AddPdxEnum.java | 8 +-
.../cache/tier/sockets/command/AddPdxType.java | 9 +-
.../tier/sockets/command/ExecuteFunction.java | 5 +-
.../tier/sockets/command/ExecuteFunction65.java | 5 +-
.../tier/sockets/command/ExecuteFunction66.java | 7 +-
.../sockets/command/GatewayReceiverCommand.java | 18 +-
.../tier/sockets/command/GetPDXEnumById.java | 8 +-
.../tier/sockets/command/GetPDXIdForEnum.java | 8 +-
.../tier/sockets/command/GetPDXIdForType.java | 8 +-
.../tier/sockets/command/GetPDXTypeById.java | 8 +-
.../tier/sockets/command/GetPdxEnums70.java | 4 +-
.../tier/sockets/command/GetPdxTypes70.java | 4 +-
.../cache/tier/sockets/command/Query.java | 7 +-
.../cache/tier/sockets/command/Query651.java | 28 +--
.../tier/sockets/command/RequestEventValue.java | 2 -
.../tier/sockets/command/TXFailoverCommand.java | 13 +-
.../internal/cache/tx/ClientTXStateStub.java | 39 ++-
.../internal/cache/tx/DistTxEntryEvent.java | 7 +-
.../cache/wan/AbstractGatewaySender.java | 30 +--
.../AbstractGatewaySenderEventProcessor.java | 56 +++--
.../cache/wan/GatewaySenderAdvisor.java | 35 +--
...rentParallelGatewaySenderEventProcessor.java | 46 +---
.../ParallelGatewaySenderEventProcessor.java | 39 +--
.../parallel/ParallelGatewaySenderQueue.java | 130 ++--------
.../parallel/ParallelQueueRemovalMessage.java | 4 +-
.../wan/serial/SerialGatewaySenderQueue.java | 21 +-
.../internal/cache/xmlcache/CacheCreation.java | 30 +++
.../cache/xmlcache/CacheXmlGenerator.java | 130 ++--------
.../internal/cache/xmlcache/CacheXmlParser.java | 5 +-
.../xmlcache/RegionAttributesCreation.java | 44 ++--
.../internal/cache/xmlcache/RegionCreation.java | 40 ---
.../apache/geode/internal/offheap/DataType.java | 7 +-
.../internal/offheap/MemoryAllocatorImpl.java | 23 +-
.../management/internal/JmxManagerAdvisee.java | 13 +-
.../management/internal/JmxManagerAdvisor.java | 21 +-
.../management/internal/ManagementAgent.java | 78 +++---
.../management/internal/ManagementFunction.java | 12 +-
.../geode/management/internal/Manager.java | 28 +--
.../geode/management/internal/RestAgent.java | 14 +-
.../internal/SystemManagementService.java | 48 +---
.../internal/beans/CacheServerBridge.java | 35 +--
.../internal/beans/DistributedSystemBridge.java | 105 +-------
.../internal/beans/LocatorMBeanBridge.java | 19 +-
.../internal/beans/ManagementAdapter.java | 128 +++-------
.../internal/beans/ManagementListener.java | 17 +-
.../internal/beans/MemberMBeanBridge.java | 195 ++++++---------
.../internal/beans/RegionMBeanBridge.java | 33 +--
.../geode/management/internal/cli/CliUtil.java | 114 +++++----
.../cli/commands/AbstractCommandsSupport.java | 29 ++-
.../CreateAlterDestroyRegionCommands.java | 103 ++++----
.../internal/cli/commands/DataCommands.java | 124 ++++------
.../cli/commands/DiskStoreCommands.java | 85 +++----
...xportImportClusterConfigurationCommands.java | 42 ++--
.../cli/commands/ExportLogsCommand.java | 48 ++--
.../internal/cli/commands/FunctionCommands.java | 59 ++---
.../internal/cli/commands/IndexCommands.java | 3 +-
.../cli/commands/MiscellaneousCommands.java | 242 +++++++------------
.../internal/cli/commands/StatusCommands.java | 12 +-
.../functions/AlterRuntimeConfigFunction.java | 24 +-
.../cli/functions/ContunuousQueryFunction.java | 25 +-
.../CreateAsyncEventQueueFunction.java | 24 +-
.../cli/functions/CreateDiskStoreFunction.java | 10 +-
.../internal/cli/functions/DeployFunction.java | 18 +-
.../cli/functions/DestroyDiskStoreFunction.java | 9 +-
.../cli/functions/ExportLogsFunction.java | 45 ++--
.../FetchSharedConfigurationStatusFunction.java | 3 +-
.../cli/functions/ListDeployedFunction.java | 9 +-
.../ShowMissingDiskStoresFunction.java | 5 +-
.../cli/functions/SizeExportLogsFunction.java | 22 +-
.../cli/functions/UndeployFunction.java | 9 +-
.../functions/GetRegionNamesFunction.java | 3 +-
.../functions/RecreateCacheFunction.java | 4 +-
.../internal/messages/CompactRequest.java | 12 +-
.../controllers/AbstractCommandsController.java | 38 +--
.../pdx/internal/CheckTypeRegistryState.java | 4 +-
.../geode/pdx/internal/PdxInstanceImpl.java | 49 +---
.../geode/pdx/internal/PdxReaderImpl.java | 19 +-
.../geode/pdx/internal/PdxUnreadData.java | 11 +-
.../geode/pdx/internal/PdxWriterImpl.java | 32 ++-
.../pdx/internal/PeerTypeRegistration.java | 19 +-
.../pdx/internal/WritablePdxInstanceImpl.java | 5 +-
.../pdx/internal/json/PdxInstanceHelper.java | 14 +-
.../internal/json/PdxInstanceSortedHelper.java | 127 +---------
.../geode/pdx/internal/json/PdxListHelper.java | 10 +-
.../apache/geode/redis/GeodeRedisServer.java | 66 ++---
.../geode/redis/internal/RegionProvider.java | 2 -
.../internal/executor/list/ListExecutor.java | 9 +-
.../apache/geode/security/AuthInitialize.java | 11 +-
.../cache/partitioned/PartitionMessageTest.java | 4 +-
.../commands/DiskStoreCommandsJUnitTest.java | 5 +-
.../cli/commands/IndexCommandsJUnitTest.java | 3 +-
.../cache/query/internal/cq/ServerCQImpl.java | 7 +-
.../internal/DestroyLuceneIndexMessage.java | 31 ++-
.../cli/LuceneIndexCommandsJUnitTest.java | 4 +-
.../apache/geode/cache/util/AutoBalancer.java | 4 +-
.../cache/wan/GatewayReceiverFactoryImpl.java | 13 +-
.../internal/cache/wan/GatewayReceiverImpl.java | 22 +-
.../wan/GatewaySenderEventRemoteDispatcher.java | 23 +-
.../cache/wan/GatewaySenderFactoryImpl.java | 21 +-
.../wan/parallel/ParallelGatewaySenderImpl.java | 14 +-
.../wan/serial/SerialGatewaySenderImpl.java | 13 +-
125 files changed, 1481 insertions(+), 2405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
index 1a97cb6..791f2ce 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
@@ -47,7 +47,7 @@ import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.ClassBuilder;
import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result.Status;
import org.apache.geode.management.internal.cli.HeadlessGfsh;
import org.apache.geode.management.internal.cli.commands.CliCommandTestBase;
@@ -402,7 +402,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
localProps.setProperty(LOCATORS, "localhost[" + locator1Port + "]");
localProps.setProperty(NAME, "DataMember");
getSystem(localProps);
- Cache cache = getCache();
+ InternalCache cache = getCache();
assertNotNull(cache);
return getAllNormalMembers(cache);
}
@@ -415,7 +415,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
locatorAndMgr.invoke(new SerializableCallable() {
@Override
public Object call() throws Exception {
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
ShutdownAllRequest.send(cache.getInternalDistributedSystem().getDistributionManager(), -1);
return null;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
index 67714ec..35d52c0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Vector;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -32,20 +31,17 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryInvocationTargetException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
/**
* Gemfire function to add free items in the existing order if the total price for that order is
* greater then the argument
*/
-
public class AddFreeItemToOrders implements Function {
public void execute(FunctionContext context) {
-
- Cache c = null;
- Region r = null;
+ Region region = null;
List<Object> vals = new ArrayList<Object>();
List<Object> keys = new ArrayList<Object>();
List<Object> argsList = new ArrayList<Object>();
@@ -64,10 +60,11 @@ public class AddFreeItemToOrders implements Function {
System.out.println("AddFreeItemToOrders : Invalid Arguments");
}
+ InternalCache cache = null;
try {
- c = CacheFactory.getAnyInstance();
- ((GemFireCacheImpl) c).getCacheConfig().setPdxReadSerialized(true);
- r = c.getRegion("orders");
+ cache = (InternalCache) CacheFactory.getAnyInstance();
+ cache.getCacheConfig().setPdxReadSerialized(true);
+ region = cache.getRegion("orders");
} catch (CacheClosedException ex) {
vals.add("NoCacheFoundResult");
context.getResultSender().lastResult(vals);
@@ -78,7 +75,7 @@ public class AddFreeItemToOrders implements Function {
Object queryArgs[] = new Object[1];
queryArgs[0] = argsList.get(0);
- final Query query = c.getQueryService().newQuery(oql);
+ final Query query = cache.getQueryService().newQuery(oql);
SelectResults result = null;
try {
@@ -90,24 +87,24 @@ public class AddFreeItemToOrders implements Function {
keys.add(item);
}
} catch (FunctionDomainException e) {
- if (c != null)
- c.getLogger()
+ if (cache != null)
+ cache.getLogger()
.info("Caught FunctionDomainException while executing function AddFreeItemToOrders: "
+ e.getMessage());
} catch (TypeMismatchException e) {
- if (c != null)
- c.getLogger()
+ if (cache != null)
+ cache.getLogger()
.info("Caught TypeMismatchException while executing function AddFreeItemToOrders: "
+ e.getMessage());
} catch (NameResolutionException e) {
- if (c != null)
- c.getLogger()
+ if (cache != null)
+ cache.getLogger()
.info("Caught NameResolutionException while executing function AddFreeItemToOrders: "
+ e.getMessage());
} catch (QueryInvocationTargetException e) {
- if (c != null)
- c.getLogger().info(
+ if (cache != null)
+ cache.getLogger().info(
"Caught QueryInvocationTargetException while executing function AddFreeItemToOrders"
+ e.getMessage());
}
@@ -116,13 +113,13 @@ public class AddFreeItemToOrders implements Function {
try {
Item it = (Item) (argsList.get(1));
for (Object key : keys) {
- Object obj = r.get(key);
+ Object obj = region.get(key);
if (obj instanceof PdxInstance) {
PdxInstance pi = (PdxInstance) obj;
Order receivedOrder = (Order) pi.getObject();
receivedOrder.addItem(it);
- r.put(key, receivedOrder);
+ region.put(key, receivedOrder);
}
}
@@ -134,7 +131,6 @@ public class AddFreeItemToOrders implements Function {
} catch (Exception e) {
context.getResultSender().lastResult("failure");
}
-
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 1802140..45e7a61 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -65,6 +65,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
@@ -176,8 +177,8 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
props.setProperty(HTTP_SERVICE_PORT, String.valueOf(restServicerPort));
DistributedSystem ds = getSystem(props);
- Cache cache = CacheFactory.create(ds);
- ((GemFireCacheImpl) cache).setReadSerialized(true);
+ InternalCache cache = (InternalCache) CacheFactory.create(ds);
+ cache.setReadSerialized(true);
AttributesFactory factory = new AttributesFactory();
factory.setEnableBridgeConflation(true);
@@ -475,7 +476,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
* ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange( restEndpoint +
* "/People/1?op=cas", HttpMethod.PUT, entity, String.class); } } catch
* (HttpClientErrorException e) {
- *
+ *
* fail("Caught HttpClientErrorException while doing put with op=cas"); }catch
* (HttpServerErrorException se) {
* fail("Caught HttpServerErrorException while doing put with op=cas"); }
@@ -747,10 +748,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
/**
* InterOps Test between REST-client, Peer Cache Client and Client Cache
- *
- * @throws Exception
*/
-
@Test
public void testInterOpsWithReplicatedRegion() throws Exception {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index bb13966..6df3663 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -67,6 +67,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.management.ManagementException;
import org.apache.geode.test.dunit.Host;
@@ -152,8 +153,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
props = configureSSL(props, sslProperties, clusterLevel);
DistributedSystem ds = getSystem(props);
- Cache cache = CacheFactory.create(ds);
- ((GemFireCacheImpl) cache).setReadSerialized(true);
+ InternalCache cache = (InternalCache) CacheFactory.create(ds);
+ cache.setReadSerialized(true);
AttributesFactory factory = new AttributesFactory();
factory.setEnableBridgeConflation(true);
@@ -276,7 +277,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
private void closeCache() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
cache.close();
cache.getDistributedSystem().disconnect();
@@ -293,9 +294,9 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
/**
- * @Deprecated once the legacy SSL properties have been removed we need to remove this logic.
+ * @deprecated once the legacy SSL properties have been removed we need to remove this logic.
*/
- @Deprecated()
+ @Deprecated
private Properties configureSSL(Properties props, Properties sslProperties,
boolean clusterLevel) {
@@ -368,7 +369,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
if ((ex.getCause() instanceof BindException)
|| (ex.getCause() != null && ex.getCause().getCause() instanceof BindException)) {
// close cache and disconnect
- GemFireCacheImpl existingInstance = GemFireCacheImpl.getInstance();
+ InternalCache existingInstance = GemFireCacheImpl.getInstance();
if (existingInstance != null) {
existingInstance.close();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 e93def5..fbfd2b7 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
@@ -932,6 +932,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
return this.isRESTServiceRunning;
}
+ @Override
public void setRESTServiceRunning(boolean isRESTServiceRunning) {
this.isRESTServiceRunning = isRESTServiceRunning;
}
@@ -941,6 +942,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
*
* @return RestAgent
*/
+ @Override
public RestAgent getRestAgent() {
return this.restAgent;
}
@@ -1925,6 +1927,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
close(false);
}
+ @Override
public void close(String reason, boolean keepAlive, boolean keepDS) {
close(reason, null, keepAlive, keepDS);
}
@@ -1972,6 +1975,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
*
* @return the GatewaySender distributed lock service
*/
+ @Override
public DistributedLockService getGatewaySenderLockService() {
if (this.gatewayLockService == null) {
synchronized (this.gatewayLockServiceLock) {
@@ -2751,10 +2755,12 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
return this.system.getSecurityInternalLogWriter();
}
+ @Override
public InternalLogWriter getInternalLogWriter() {
return this.system.getInternalLogWriter();
}
+ @Override
public InternalLogWriter getSecurityInternalLogWriter() {
return this.system.getSecurityInternalLogWriter();
}
@@ -2804,6 +2810,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
* @param declarable The declarable
* @return Properties found for the given declarable
*/
+ @Override
public Properties getDeclarableProperties(final Declarable declarable) {
return this.declarablePropertiesMap.get(declarable);
}
@@ -3204,6 +3211,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
return result;
}
+ @Override
public Set<LocalRegion> getApplicationRegions() {
Set<LocalRegion> result = new HashSet<>();
synchronized (this.rootRegions) {
@@ -3770,6 +3778,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
return addCacheServer(false);
}
+ @Override
public CacheServer addCacheServer(boolean isGatewayReceiver) {
if (isClient()) {
throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3832,6 +3841,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
}
+ @Override
public void removeGatewaySender(GatewaySender sender) {
if (isClient()) {
throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3852,6 +3862,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
}
+ @Override
public void addGatewayReceiver(GatewayReceiver receiver) {
if (isClient()) {
throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -5084,6 +5095,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
}
// test hook
+ @Override
public void setReadSerialized(boolean value) {
this.cacheConfig.setPdxReadSerialized(value);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index 7313f71..c7ee361 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -41,6 +41,8 @@ import org.apache.geode.cache.client.internal.ClientMetadataService;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.QueryMonitor;
import org.apache.geode.cache.query.internal.cq.CqService;
+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.DistributedLockService;
import org.apache.geode.distributed.internal.CacheTime;
@@ -56,8 +58,10 @@ import org.apache.geode.internal.cache.persistence.BackupManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.management.internal.JmxManagerAdvisor;
+import org.apache.geode.management.internal.RestAgent;
import org.apache.geode.pdx.internal.TypeRegistry;
/**
@@ -274,4 +278,28 @@ public interface InternalCache extends Cache, Extensible<Cache>, CacheTime {
boolean isQueryMonitorDisabledForLowMemory();
boolean isRESTServiceRunning();
+
+ InternalLogWriter getInternalLogWriter();
+
+ InternalLogWriter getSecurityInternalLogWriter();
+
+ Set<LocalRegion> getApplicationRegions();
+
+ void removeGatewaySender(GatewaySender sender);
+
+ DistributedLockService getGatewaySenderLockService();
+
+ RestAgent getRestAgent();
+
+ Properties getDeclarableProperties(final Declarable declarable);
+
+ void setRESTServiceRunning(boolean isRESTServiceRunning);
+
+ void close(String reason, boolean keepAlive, boolean keepDS);
+
+ void addGatewayReceiver(GatewayReceiver receiver);
+
+ CacheServer addCacheServer(boolean isGatewayReceiver);
+
+ void setReadSerialized(boolean value);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
index 707b408..2ff6ed6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapEvictor.java
@@ -87,7 +87,7 @@ public class HeapEvictor implements ResourceListener<MemoryEvent> {
private AtomicBoolean mustEvict = new AtomicBoolean(false);
- protected final Cache cache;
+ protected final InternalCache cache;
private final ArrayList<Integer> testTaskSetSizes = new ArrayList<>();
public volatile int testAbortAfterLoopCount = Integer.MAX_VALUE;
@@ -96,7 +96,7 @@ public class HeapEvictor implements ResourceListener<MemoryEvent> {
private final AtomicBoolean isRunning = new AtomicBoolean(true);
- public HeapEvictor(Cache gemFireCache) {
+ public HeapEvictor(InternalCache gemFireCache) {
this.cache = gemFireCache;
initializeEvictorThreadPool();
}
@@ -169,8 +169,8 @@ public class HeapEvictor implements ResourceListener<MemoryEvent> {
return allRegionList;
}
- public GemFireCacheImpl getGemFireCache() {
- return (GemFireCacheImpl) this.cache;
+ public InternalCache getGemFireCache() {
+ return (InternalCache) this.cache;
}
private void initializeEvictorThreadPool() {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
index 2fd42f5..fdf694b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.internal.cache.lru;
+import java.util.Properties;
+
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
@@ -23,21 +25,20 @@ import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
import org.apache.geode.internal.i18n.LocalizedStrings;
-
-import java.util.Properties;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
/**
* A <code>HeapLRUCapacityController</code> controls the contents of {@link Region} based on the
* percentage of memory that is currently being used. If the percentage of memory in use exceeds the
* given percentage, then the least recently used entry of the region is evicted.
- *
- * <P>
- *
+ * <p>
* For heap regions: GemStone has found that the <code>HeapLRUCapacityController</code> has the most
* effect on a VM that is lauched with both the <code>-Xmx</code> and <code>-Xms</code> switches
* used. Many virtual machine implementations have additional VM switches to control the behavior of
@@ -46,8 +47,7 @@ import java.util.Properties;
* <A href="http://java.sun.com/docs/hotspot/gc/index.html">HotSpot</a> VM, the
* <code>-XX:+UseConcMarkSweepGC</code> and <code>-XX:+UseParNewGC</code> options improve the
* behavior of the <code>HeapLRUCapacityController</code>.
- *
- *
+ *
* @since GemFire 3.2
*/
@SuppressWarnings("synthetic-access")
@@ -268,7 +268,7 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
* greater than the overflow threshold, then we evict the LRU entry.
*/
public boolean mustEvict(LRUStatistics stats, Region region, int delta) {
- final GemFireCacheImpl cache = (GemFireCacheImpl) region.getRegionService();
+ final InternalCache cache = (InternalCache) region.getRegionService();
InternalResourceManager resourceManager = cache.getInternalResourceManager();
boolean offheap = region.getAttributes().getOffHeap();
final boolean monitorStateIsEviction =
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/OffHeapEvictor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/OffHeapEvictor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/OffHeapEvictor.java
index 2d2e7cc..058673f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/OffHeapEvictor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/OffHeapEvictor.java
@@ -14,9 +14,8 @@
*/
package org.apache.geode.internal.cache.lru;
-import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
@@ -36,7 +35,7 @@ public class OffHeapEvictor extends HeapEvictor {
private long bytesToEvictWithEachBurst;
- public OffHeapEvictor(Cache gemFireCache) {
+ public OffHeapEvictor(InternalCache gemFireCache) {
super(gemFireCache);
calculateEvictionBurst();
}
@@ -46,7 +45,7 @@ public class OffHeapEvictor extends HeapEvictor {
DistributionConfig.GEMFIRE_PREFIX + "HeapLRUCapacityController.evictionBurstPercentage",
"0.4"));
- MemoryAllocator allocator = ((GemFireCacheImpl) this.cache).getOffHeapStore();
+ MemoryAllocator allocator = this.cache.getOffHeapStore();
/*
* Bail if there is no off-heap memory to evict.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 2314674..5129044 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
@@ -53,6 +53,7 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.FilterRoutingInfo;
import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionException;
import org.apache.geode.internal.cache.PrimaryBucketException;
@@ -259,7 +260,7 @@ public abstract class PartitionMessage extends DistributionMessage
* check to see if the cache is closing
*/
public boolean checkCacheClosing(DistributionManager dm) {
- GemFireCacheImpl cache = getGemFireCacheImpl();
+ InternalCache cache = getInternalCache();
// return (cache != null && cache.isClosed());
return cache == null || cache.isClosed();
}
@@ -278,11 +279,11 @@ public abstract class PartitionMessage extends DistributionMessage
return PartitionedRegion.getPRFromId(this.regionId);
}
- GemFireCacheImpl getGemFireCacheImpl() {
+ InternalCache getInternalCache() {
return GemFireCacheImpl.getInstance();
}
- TXManagerImpl getTXManagerImpl(GemFireCacheImpl cache) {
+ TXManagerImpl getTXManagerImpl(InternalCache cache) {
return cache.getTxManager();
}
@@ -327,7 +328,7 @@ public abstract class PartitionMessage extends DistributionMessage
}
thr = UNHANDLED_EXCEPTION;
- GemFireCacheImpl cache = getGemFireCacheImpl();
+ InternalCache cache = getInternalCache();
if (cache == null) {
throw new ForceReattemptException(
LocalizedStrings.PartitionMessage_REMOTE_CACHE_IS_CLOSED_0.toLocalizedString());
@@ -862,7 +863,7 @@ public abstract class PartitionMessage extends DistributionMessage
* For Distributed Tx
*/
private void setIfTransactionDistributed() {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null) {
if (cache.getTxManager() != null) {
this.isTransactionDistributed = cache.getTxManager().isDistributed();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
index 38f9b45..e91bd15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
@@ -14,6 +14,18 @@
*/
package org.apache.geode.internal.cache.partitioned;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.CancelException;
import org.apache.geode.cache.partition.PartitionMemberInfo;
import org.apache.geode.cache.partition.PartitionRebalanceInfo;
@@ -24,7 +36,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.ColocationHelper;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegion.RecoveryLock;
import org.apache.geode.internal.cache.control.InternalResourceManager;
@@ -33,15 +45,17 @@ import org.apache.geode.internal.cache.control.ResourceManagerStats;
import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketResponse;
import org.apache.geode.internal.cache.partitioned.MoveBucketMessage.MoveBucketResponse;
import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketResponse;
-import org.apache.geode.internal.cache.partitioned.rebalance.*;
+import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator;
+import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperatorImpl;
+import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperatorWrapper;
+import org.apache.geode.internal.cache.partitioned.rebalance.ParallelBucketOperator;
+import org.apache.geode.internal.cache.partitioned.rebalance.PartitionedRegionLoadModel;
import org.apache.geode.internal.cache.partitioned.rebalance.PartitionedRegionLoadModel.AddressComparor;
+import org.apache.geode.internal.cache.partitioned.rebalance.RebalanceDirector;
+import org.apache.geode.internal.cache.partitioned.rebalance.SimulatedBucketOperator;
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.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* This class performs a rebalance on a single partitioned region.
@@ -62,8 +76,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
*
* There is also a FPRDirector that creates buckets and moves primaries for fixed partititioned
* regions.
- *
- *
*/
@SuppressWarnings("synthetic-access")
public class PartitionedRegionRebalanceOp {
@@ -179,8 +191,7 @@ public class PartitionedRegionRebalanceOp {
leaderRegion.getRegionAdvisor().addMembershipListener(listener);
PartitionedRegionLoadModel model = null;
-
- GemFireCacheImpl cache = (GemFireCacheImpl) leaderRegion.getCache();
+ InternalCache cache = leaderRegion.getCache();
Map<PartitionedRegion, InternalPRInfo> detailsMap = fetchDetails(cache);
BucketOperatorWrapper serialOperator = getBucketOperator(detailsMap);
ParallelBucketOperator parallelOperator = new ParallelBucketOperator(MAX_PARALLEL_OPERATIONS,
@@ -324,7 +335,7 @@ public class PartitionedRegionRebalanceOp {
}
long start = System.nanoTime();
- GemFireCacheImpl cache = (GemFireCacheImpl) leaderRegion.getCache();
+ InternalCache cache = leaderRegion.getCache();
InternalResourceManager resourceManager =
InternalResourceManager.getInternalResourceManager(cache);
InternalResourceManager.getResourceObserver().recoveryStarted(targetRegion);
@@ -387,7 +398,7 @@ public class PartitionedRegionRebalanceOp {
}
}
- private Map<PartitionedRegion, InternalPRInfo> fetchDetails(GemFireCacheImpl cache) {
+ private Map<PartitionedRegion, InternalPRInfo> fetchDetails(InternalCache cache) {
LoadProbe probe = cache.getInternalResourceManager().getLoadProbe();
Map<PartitionedRegion, InternalPRInfo> detailsMap =
new LinkedHashMap<PartitionedRegion, InternalPRInfo>(colocatedRegions.size());
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
index ebf8fbe..46c55a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.partition.PartitionMemberInfo;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.partitioned.InternalPartitionDetails;
import org.apache.geode.internal.cache.partitioned.OfflineMemberDetails;
@@ -65,7 +64,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
* This model is not threadsafe.
*
* @since GemFire 6.0
- *
*/
@SuppressWarnings("synthetic-access")
public class PartitionedRegionLoadModel {
@@ -147,7 +145,6 @@ public class PartitionedRegionLoadModel {
private final PartitionedRegion partitionedRegion;
-
/**
* Create a new model
*
@@ -408,10 +405,7 @@ public class PartitionedRegionLoadModel {
});
}
-
-
protected void remoteOverRedundancyBucket(BucketRollup bucket, Member targetMember) {
-
Move bestMove = new Move(null, targetMember, bucket);
Map<String, Long> colocatedRegionSizes = getColocatedRegionSizes(bucket);
@@ -1037,13 +1031,10 @@ public class PartitionedRegionLoadModel {
Map<String, Member> getColocatedMembers() {
return this.colocatedMembers;
}
-
-
}
/**
* Represents the sum of all of colocated buckets with a given bucket id.
- *
*/
protected class BucketRollup extends Bucket {
private final Map<String, Bucket> colocatedBuckets = new HashMap<String, Bucket>();
@@ -1073,7 +1064,6 @@ public class PartitionedRegionLoadModel {
primaryLoad = b.getPrimaryLoad();
}
rollup.updateLoad(b.getLoad(), primaryLoad, b.getBytes());
-
}
return true;
}
@@ -1466,8 +1456,6 @@ public class PartitionedRegionLoadModel {
/**
* Represents a move from one node to another. Used to keep track of moves that we have already
* attempted that have failed.
- *
- *
*/
protected static class Move {
private final Member source;
@@ -1481,7 +1469,6 @@ public class PartitionedRegionLoadModel {
this.bucket = bucket;
}
-
/**
* @return the source
*/
@@ -1489,7 +1476,6 @@ public class PartitionedRegionLoadModel {
return this.source;
}
-
/**
* @return the target
*/
@@ -1497,7 +1483,6 @@ public class PartitionedRegionLoadModel {
return this.target;
}
-
/**
* @return the bucket
*/
@@ -1505,7 +1490,6 @@ public class PartitionedRegionLoadModel {
return this.bucket;
}
-
@Override
public int hashCode() {
final int prime = 31;
@@ -1542,9 +1526,6 @@ public class PartitionedRegionLoadModel {
return false;
return true;
}
-
-
-
}
public static interface AddressComparor {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
index 8e39e18..f464e0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
@@ -14,22 +14,6 @@
*/
package org.apache.geode.internal.cache.persistence;
-import org.apache.commons.io.FileUtils;
-import org.apache.geode.InternalGemFireError;
-import org.apache.geode.cache.DiskStore;
-import org.apache.geode.cache.persistence.PersistentID;
-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.MembershipListener;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.DeployedJar;
-import org.apache.geode.internal.JarDeployer;
-import org.apache.geode.internal.cache.DiskStoreImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
@@ -45,10 +29,25 @@ import java.util.concurrent.CountDownLatch;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.io.FileUtils;
+
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.persistence.PersistentID;
+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.MembershipListener;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.DeployedJar;
+import org.apache.geode.internal.JarDeployer;
+import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
/**
* This class manages the state an logic to backup a single cache.
- *
- *
*/
public class BackupManager implements MembershipListener {
@@ -59,11 +58,11 @@ public class BackupManager implements MembershipListener {
public static final String USER_FILES = "user";
public static final String CONFIG = "config";
private InternalDistributedMember sender;
- private GemFireCacheImpl cache;
+ private InternalCache cache;
private CountDownLatch allowDestroys = new CountDownLatch(1);
private volatile boolean isCancelled = false;
- public BackupManager(InternalDistributedMember sender, GemFireCacheImpl gemFireCache) {
+ public BackupManager(InternalDistributedMember sender, InternalCache gemFireCache) {
this.sender = sender;
this.cache = gemFireCache;
}
@@ -230,7 +229,6 @@ public class BackupManager implements MembershipListener {
}
}
-
return persistentIds;
} finally {
@@ -259,7 +257,7 @@ public class BackupManager implements MembershipListener {
FileUtils.copyFile(new File(DistributedSystem.getPropertiesFile()), propertyBackup);
}
- // TODO sbawaska: should the gfsecurity.properties file be backed up?
+ // TODO: should the gfsecurity.properties file be backed up?
}
private void backupUserFiles(RestoreScript restoreScript, File backupDir) throws IOException {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/CacheSnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/CacheSnapshotServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/CacheSnapshotServiceImpl.java
index 5a3c002..c9aeaed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/CacheSnapshotServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/CacheSnapshotServiceImpl.java
@@ -26,20 +26,19 @@ import org.apache.geode.cache.snapshot.CacheSnapshotService;
import org.apache.geode.cache.snapshot.RegionSnapshotService;
import org.apache.geode.cache.snapshot.SnapshotOptions;
import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.snapshot.GFSnapshot.GFSnapshotImporter;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Provides an implementation for cache snapshots. Most of the implementation delegates to
* {@link RegionSnapshotService}.
- *
*/
public class CacheSnapshotServiceImpl implements CacheSnapshotService {
/** the cache */
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
- public CacheSnapshotServiceImpl(GemFireCacheImpl cache) {
+ public CacheSnapshotServiceImpl(InternalCache cache) {
this.cache = cache;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
index 34ddd63..5ba8800 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
@@ -24,28 +24,24 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
-import java.util.TreeMap;
import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.snapshot.SnapshotIterator;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
/**
* Provides support for reading and writing snapshot files.
- *
*/
public class GFSnapshot {
/**
@@ -260,7 +256,7 @@ public class GFSnapshot {
// write pdx types
try {
- GemFireCacheImpl cache = GemFireCacheImpl
+ InternalCache cache = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
new ExportedRegistry(cache.getPdxRegistry()).toData(dos);
} catch (CacheClosedException e) {
@@ -400,7 +396,7 @@ public class GFSnapshot {
}
private TypeRegistry getRegistry() {
- GemFireCacheImpl gfc = GemFireCacheImpl.getInstance();
+ InternalCache gfc = GemFireCacheImpl.getInstance();
if (gfc != null) {
return gfc.getPdxRegistry();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
index 0a182e6..a82a804 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/CachedRegionHelper.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache.tier;
import org.apache.geode.CancelException;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.InternalCache;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 aeabc86..7b291da 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
@@ -28,6 +28,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.logging.log4j.Logger;
@@ -41,7 +42,6 @@ import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientHealthMonitor;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -291,7 +291,7 @@ public final class InternalClientMembership {
public static Map getClientQueueSizes() {
Map clientQueueSizes = new HashMap();
- GemFireCacheImpl c = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache c = (InternalCache) CacheFactory.getAnyInstance();
if (c == null) // Add a NULL Check
return clientQueueSizes;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 ed29472..9114367 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
@@ -67,12 +67,15 @@ import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.wan.GatewayTransportFilter;
-import org.apache.geode.distributed.internal.*;
-import org.apache.geode.internal.net.SocketCreator;
+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.PooledExecutorWithDMStats;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.BucketAdvisor.BucketProfile;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.partitioned.AllBucketProfilesUpdateMessage;
@@ -83,10 +86,11 @@ 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.LocalizedMessage;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.internal.util.ArrayUtils;
@@ -375,9 +379,9 @@ public class AcceptorImpl extends Acceptor implements Runnable {
.getSocketCreatorForComponent(SecurableCommunicationChannel.GATEWAY);
}
- final GemFireCacheImpl gc;
+ final InternalCache gc;
if (getCachedRegionHelper() != null) {
- gc = (GemFireCacheImpl) getCachedRegionHelper().getCache();
+ gc = getCachedRegionHelper().getCache();
} else {
gc = null;
}
@@ -655,8 +659,7 @@ public class AcceptorImpl extends Acceptor implements Runnable {
+ this.localPort + " local port: " + this.serverSock.getLocalPort());
this.selectorThread.start();
}
- GemFireCacheImpl myCache = (GemFireCacheImpl) cache;
- Set<PartitionedRegion> prs = myCache.getPartitionedRegions();
+ Set<PartitionedRegion> prs = this.cache.getPartitionedRegions();
for (PartitionedRegion pr : prs) {
Map<Integer, BucketAdvisor.BucketProfile> profiles =
new HashMap<Integer, BucketAdvisor.BucketProfile>();
@@ -957,7 +960,7 @@ public class AcceptorImpl extends Acceptor implements Runnable {
{
SystemFailure.checkFailure();
// this.cache.getDistributedSystem().getCancelCriterion().checkCancelInProgress(null);
- if (((GemFireCacheImpl) this.cache).isClosed()) { // bug 38834
+ if (this.cache.isClosed()) { // bug 38834
break; // TODO should just ask cache's CancelCriterion
}
if (this.cache.getCancelCriterion().isCancelInProgress()) {
@@ -1559,9 +1562,8 @@ public class AcceptorImpl extends Acceptor implements Runnable {
}
private void notifyCacheMembersOfClose() {
- GemFireCacheImpl myCache = (GemFireCacheImpl) cache;
- if (!myCache.forcedDisconnect()) {
- for (PartitionedRegion pr : myCache.getPartitionedRegions()) {
+ if (!this.cache.forcedDisconnect()) {
+ for (PartitionedRegion pr : this.cache.getPartitionedRegions()) {
Map<Integer, BucketAdvisor.BucketProfile> profiles = new HashMap<>();
// get all local real bucket advisors
Map<Integer, BucketAdvisor> advisors = pr.getRegionAdvisor().getAllBucketAdvisors();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 d217672..58ba4b3 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
@@ -12,13 +12,39 @@
* 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.*;
-import org.apache.geode.cache.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+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.Semaphore;
+import java.util.regex.Pattern;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.CopyException;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.SerializationException;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheLoaderException;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.persistence.PartitionOfflineException;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
@@ -27,8 +53,21 @@ import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.Version;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EntrySnapshot;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.FindVersionTagOperation;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.cache.TXStateProxy;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.VersionTagHolder;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.Command;
import org.apache.geode.internal.cache.tier.InterestType;
@@ -44,13 +83,6 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.sequencelog.EntryLogger;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.Semaphore;
-import java.util.regex.Pattern;
-
public abstract class BaseCommand implements Command {
protected static final Logger logger = LogService.getLogger();
@@ -125,7 +157,7 @@ public abstract class BaseCommand implements Command {
boolean shouldMasquerade = shouldMasqueradeForTx(msg, servConn);
try {
if (shouldMasquerade) {
- GemFireCacheImpl cache = (GemFireCacheImpl) servConn.getCache();
+ InternalCache cache = servConn.getCache();
InternalDistributedMember member =
(InternalDistributedMember) servConn.getProxyID().getDistributedMember();
TXManagerImpl txMgr = cache.getTxManager();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 28d6ae2..8a79fb6 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.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.tier.sockets;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -79,6 +78,7 @@ import org.apache.geode.distributed.internal.MessageWithReply;
import org.apache.geode.distributed.internal.ReplyMessage;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.internal.ClassLoadUtil;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
@@ -116,7 +116,6 @@ 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.logging.log4j.LocalizedMessage;
-import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.security.AccessControl;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
@@ -125,7 +124,6 @@ import org.apache.geode.security.AuthenticationRequiredException;
* Class <code>CacheClientNotifier</code> works on the server and manages client socket connections
* to clients requesting notification of updates and notifies them when updates occur.
*
- *
* @since GemFire 3.2
*/
@SuppressWarnings({"synthetic-access", "deprecation"})
@@ -1840,7 +1838,7 @@ public class CacheClientNotifier {
ClientProxyMembershipID client = proxy.getProxyID();
this._clientProxies.remove(client);
this._connectionListener.queueRemoved();
- ((GemFireCacheImpl) this.getCache()).cleanupForClient(this, client);
+ this.getCache().cleanupForClient(this, client);
if (!(proxy.clientConflation == HandShake.CONFLATION_ON)) {
ClientHealthMonitor chm = ClientHealthMonitor.getInstance();
if (chm != null) {
@@ -2035,9 +2033,9 @@ public class CacheClientNotifier {
*
* @return this <code>CacheClientNotifier</code>'s <code>Cache</code>
*/
- protected Cache getCache() { // TODO:SYNC: looks wrong
+ protected InternalCache getCache() { // TODO:SYNC: looks wrong
if (this._cache != null && this._cache.isClosed()) {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null) {
this._cache = cache;
this.logWriter = cache.getInternalLogWriter();
@@ -2073,7 +2071,7 @@ public class CacheClientNotifier {
/**
* Constructor.
- *
+ *
* @param cache The GemFire <code>Cache</code>
* @param acceptorStats
* @param maximumMessageCount
@@ -2082,11 +2080,11 @@ public class CacheClientNotifier {
* removed.
* @param overflowAttributesList
*/
- private CacheClientNotifier(Cache cache, CacheServerStats acceptorStats, int maximumMessageCount,
- int messageTimeToLive, ConnectionListener listener, List overflowAttributesList,
- boolean isGatewayReceiver) {
+ private CacheClientNotifier(InternalCache cache, CacheServerStats acceptorStats,
+ int maximumMessageCount, int messageTimeToLive, ConnectionListener listener,
+ List overflowAttributesList, boolean isGatewayReceiver) {
// Set the Cache
- this.setCache((GemFireCacheImpl) cache);
+ setCache(cache);
this.acceptorStats = acceptorStats;
this.socketCloser = new SocketCloser(1, 50); // we only need one thread per client and wait 50ms
// for close
@@ -2512,7 +2510,7 @@ public class CacheClientNotifier {
* direct reference to _cache in CacheClientNotifier code. Instead, you should always use
* <code>getCache()</code>
*/
- private GemFireCacheImpl _cache;
+ private InternalCache _cache;
private InternalLogWriter logWriter;
@@ -2631,9 +2629,8 @@ public class CacheClientNotifier {
// lazily initialize haContainer in case this CCN instance was created by a gateway receiver
if (overflowAttributesList != null
&& !HARegionQueue.HA_EVICTION_POLICY_NONE.equals(overflowAttributesList.get(0))) {
- haContainer = new HAContainerRegion(_cache.getRegion(
- Region.SEPARATOR + CacheServerImpl.clientMessagesRegion((GemFireCacheImpl) _cache,
- (String) overflowAttributesList.get(0),
+ haContainer = new HAContainerRegion(_cache.getRegion(Region.SEPARATOR
+ + CacheServerImpl.clientMessagesRegion(_cache, (String) overflowAttributesList.get(0),
((Integer) overflowAttributesList.get(1)).intValue(),
((Integer) overflowAttributesList.get(2)).intValue(),
(String) overflowAttributesList.get(3), (Boolean) overflowAttributesList.get(4))));
@@ -2664,11 +2661,10 @@ public class CacheClientNotifier {
/**
* @param _cache the _cache to set
*/
- private void setCache(GemFireCacheImpl _cache) {
+ private void setCache(InternalCache _cache) {
this._cache = _cache;
}
-
private class ExpireBlackListTask extends PoolTask {
private ClientProxyMembershipID proxyID;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 18f13f8..bc3765a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.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.tier.sockets;
import java.io.ByteArrayInputStream;
@@ -39,11 +38,14 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Pattern;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.ClientSession;
import org.apache.geode.cache.DynamicRegionFactory;
@@ -80,8 +82,8 @@ import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.FilterProfile;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InterestRegistrationEventImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.StateFlushOperation;
@@ -102,16 +104,12 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
import org.apache.geode.internal.security.AuthorizeRequestPP;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AccessControl;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadState;
/**
* Class <code>CacheClientProxy</code> represents the server side of the {@link CacheClientUpdater}.
* It queues messages to be sent from the server to the client. It then reads those messages from
* the queue and sends them to the client.
*
- *
* @since GemFire 4.2
*/
@SuppressWarnings("synthetic-access")
@@ -153,7 +151,7 @@ public class CacheClientProxy implements ClientSession {
/**
* The GemFire cache
*/
- protected final GemFireCacheImpl _cache;
+ protected final InternalCache _cache;
/**
* The list of keys that the client represented by this proxy is interested in (stored by region)
@@ -345,7 +343,7 @@ public class CacheClientProxy implements ClientSession {
Version clientVersion, long acceptorId, boolean notifyBySubscription) throws CacheException {
initializeTransientFields(socket, proxyID, isPrimary, clientConflation, clientVersion);
this._cacheClientNotifier = ccn;
- this._cache = (GemFireCacheImpl) ccn.getCache();
+ this._cache = ccn.getCache();
this._maximumMessageCount = ccn.getMaximumMessageCount();
this._messageTimeToLive = ccn.getMessageTimeToLive();
this._acceptorId = acceptorId;
@@ -620,7 +618,7 @@ public class CacheClientProxy implements ClientSession {
*
* @return the GemFire cache
*/
- public GemFireCacheImpl getCache() {
+ public InternalCache getCache() {
return this._cache;
}
@@ -2344,7 +2342,7 @@ public class CacheClientProxy implements ClientSession {
return this._proxy;
}
- private GemFireCacheImpl getCache() {
+ private InternalCache getCache() {
return getProxy().getCache();
}
@@ -2410,10 +2408,6 @@ public class CacheClientProxy implements ClientSession {
Thread.sleep(500);
} catch (InterruptedException e) {
interrupted = true;
- /*
- * GemFireCache c = (GemFireCache)_cache;
- * c.getDistributedSystem().getCancelCriterion().checkCancelInProgress(e);
- */
} catch (CancelException e) {
break;
} catch (CacheException e) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 f85ecb4..ca25b6e 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
@@ -12,24 +12,68 @@
* 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.*;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.net.ssl.SSLException;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InvalidDeltaException;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.StatisticsTypeFactory;
+import org.apache.geode.SystemFailure;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.InterestResultPolicy;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.client.ServerRefusedConnectionException;
-import org.apache.geode.cache.client.internal.*;
+import org.apache.geode.cache.client.internal.ClientUpdater;
+import org.apache.geode.cache.client.internal.Endpoint;
+import org.apache.geode.cache.client.internal.EndpointManager;
+import org.apache.geode.cache.client.internal.GetEventValueOp;
+import org.apache.geode.cache.client.internal.PoolImpl;
+import org.apache.geode.cache.client.internal.QueueManager;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener;
+import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.MemberAttributes;
-import org.apache.geode.internal.*;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.ClientServerObserver;
+import org.apache.geode.internal.cache.ClientServerObserverHolder;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.MessageType;
import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
@@ -48,19 +92,6 @@ import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.logging.log4j.Logger;
-
-import javax.net.ssl.SSLException;
-import java.io.*;
-import java.net.ConnectException;
-import java.net.Socket;
-import java.net.SocketException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* <code>CacheClientUpdater</code> is a thread that processes update messages from a cache server
@@ -114,10 +145,9 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Cache for which we provide service
*/
- private /* final */ GemFireCacheImpl cache;
+ private /* final */ InternalCache cache;
private /* final */ CachedRegionHelper cacheHelper;
-
/**
* Principle flag to signal thread's run loop to terminate
*/
@@ -144,7 +174,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
private boolean isOpCompleted;
public final static String CLIENT_UPDATER_THREAD_NAME = "Cache Client Updater Thread ";
- /*
+
+ /**
* to enable test flag
*/
public static boolean isUsedByTest;
@@ -155,20 +186,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
public static boolean fullValueRequested = false;
- // /**
- // * True if this thread been initialized. Indicates that the run thread is
- // * initialized and ready to process messages
- // * <p>
- // * TODO is this still needed?
- // * <p>
- // * Accesses synchronized via <code>this</code>
- // *
- // * @see #notifyInitializationComplete()
- // * @see #waitForInitialization()
- // */
- // private boolean initialized = false;
-
-
private final ServerLocation location;
// TODO - remove these fields
@@ -185,7 +202,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @return true if cache appears
*/
private boolean waitForCache() {
- GemFireCacheImpl c;
+ InternalCache c;
long tilt = System.currentTimeMillis() + MAX_CACHE_WAIT * 1000;
for (;;) {
if (quitting()) {
@@ -464,52 +481,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
- // /**
- // * Waits for this thread to be initialized
- // *
- // * @return true if initialized; false if stopped before init
- // */
- // public boolean waitForInitialization() {
- // boolean result = false;
- // // Yogesh : waiting on this thread object is a bad idea
- // // as when thread exits it notifies to the waiting threads.
- // synchronized (this) {
- // for (;;) {
- // if (quitting()) {
- // break;
- // }
- // boolean interrupted = Thread.interrupted();
- // try {
- // this.wait(100); // spurious wakeup ok // timed wait, should fix lost notification problem
- // rahul.
- // }
- // catch (InterruptedException e) {
- // interrupted = true;
- // }
- // finally {
- // if (interrupted) {
- // Thread.currentThread().interrupt();
- // }
- // }
- // } // while
- // // Even if we succeed, there is a risk that we were shut down
- // // Can't check for cache; it isn't set yet :-(
- // this.system.getCancelCriterion().checkCancelInProgress(null);
- // result = this.continueProcessing;
- // } // synchronized
- // return result;
- // }
-
- // /**
- // * @see #waitForInitialization()
- // */
- // private void notifyInitializationComplete() {
- // synchronized (this) {
- // this.initialized = true;
- // this.notifyAll();
- // }
- // }
-
/**
* Notifies this thread to stop processing
*/
[4/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 fe0f59f..c674e48 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
@@ -25,14 +25,13 @@ import javax.management.ObjectName;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.AlreadyRunningException;
@@ -66,13 +65,11 @@ public final class SystemManagementService extends BaseManagementService {
/**
* The concrete implementation of DistributedSystem that provides internal-only functionality.
*/
-
private InternalDistributedSystem system;
/**
* core component for distribution
*/
-
private LocalManager localManager;
/**
@@ -84,7 +81,6 @@ public final class SystemManagementService extends BaseManagementService {
/**
* Local Filter chain for local MBean filters
*/
-
private LocalFilterChain localFilterChain;
/**
@@ -103,8 +99,7 @@ public final class SystemManagementService extends BaseManagementService {
*/
private MBeanJMXAdapter jmxAdapter;
-
- private Cache cache;
+ private InternalCache cache;
private FederatingManager federatingManager;
@@ -118,7 +113,6 @@ public final class SystemManagementService extends BaseManagementService {
*/
private ManagementMembershipListener listener;
-
/**
* Proxy aggregator to create aggregate MBeans e.g. DistributedSystem and DistributedRegion
* GemFire comes with a default aggregator.
@@ -127,11 +121,11 @@ public final class SystemManagementService extends BaseManagementService {
private UniversalListenerContainer universalListenerContainer = new UniversalListenerContainer();
- public static BaseManagementService newSystemManagementService(Cache cache) {
+ public static BaseManagementService newSystemManagementService(InternalCache cache) {
return new SystemManagementService(cache).init();
}
- protected SystemManagementService(Cache cache) {
+ protected SystemManagementService(InternalCache cache) {
this.cache = cache;
this.system = (InternalDistributedSystem) cache.getDistributedSystem();
// This is a safe check to ensure Management service does not start for a
@@ -166,7 +160,6 @@ public final class SystemManagementService extends BaseManagementService {
* ManagementFunction
*/
private SystemManagementService init() {
-
try {
this.localManager = new LocalManager(repo, system, this, cache);
this.localManager.startManager();
@@ -182,7 +175,6 @@ public final class SystemManagementService extends BaseManagementService {
logger.error(e.getMessage(), e);
throw new ManagementException(e);
}
-
}
/**
@@ -265,12 +257,11 @@ public final class SystemManagementService extends BaseManagementService {
this.agent.stopAgent();
}
- getGemFireCacheImpl().getJmxManagerAdvisor().broadcastChange();
+ getInternalCache().getJmxManagerAdvisor().broadcastChange();
instances.remove(cache);
localManager = null;
closed = true;
}
-
}
@Override
@@ -305,7 +296,6 @@ public final class SystemManagementService extends BaseManagementService {
if (isManager()) {
afterCreateProxy(objectName, interfaceClass, object, fedComp);
}
-
}
@Override
@@ -349,7 +339,6 @@ public final class SystemManagementService extends BaseManagementService {
return bean;
}
-
public <T> T getMBeanProxy(ObjectName objectName, Class<T> interfaceClass) { // TODO: this is too
// generic
if (!isStartedAndOpen()) {
@@ -372,7 +361,6 @@ public final class SystemManagementService extends BaseManagementService {
@Override
public Set<ObjectName> queryMBeanNames(DistributedMember member) {
-
if (!isStartedAndOpen()) {
return Collections.emptySet();
}
@@ -387,7 +375,6 @@ public final class SystemManagementService extends BaseManagementService {
}
return federatingManager.findAllProxies(member);
}
-
}
@Override
@@ -441,7 +428,7 @@ public final class SystemManagementService extends BaseManagementService {
@Override
public void startManager() {
- if (!getGemFireCacheImpl().getSystem().getConfig().getJmxManager()) {
+ if (!getInternalCache().getInternalDistributedSystem().getConfig().getJmxManager()) {
// fix for 45900
throw new ManagementException(
"Could not start the manager because the gemfire property \"jmx-manager\" is false.");
@@ -466,9 +453,9 @@ public final class SystemManagementService extends BaseManagementService {
system.handleResourceEvent(ResourceEvent.MANAGER_START, null);
federatingManager.startManager();
if (this.agent != null) {
- this.agent.startAgent(getGemFireCacheImpl());
+ this.agent.startAgent(getInternalCache());
}
- getGemFireCacheImpl().getJmxManagerAdvisor().broadcastChange();
+ getInternalCache().getJmxManagerAdvisor().broadcastChange();
started = true;
} catch (RuntimeException e) {
logger.error("Jmx manager could not be started because {}", e.getMessage(), e);
@@ -488,13 +475,12 @@ public final class SystemManagementService extends BaseManagementService {
}
}
- private GemFireCacheImpl getGemFireCacheImpl() {
- return (GemFireCacheImpl) this.cache;
+ private InternalCache getInternalCache() {
+ return this.cache;
}
/**
* Creates a Manager instance in stopped state.
- *
*/
public boolean createManager() {
synchronized (instances) {
@@ -504,7 +490,7 @@ public final class SystemManagementService extends BaseManagementService {
system.handleResourceEvent(ResourceEvent.MANAGER_CREATE, null);
// An initialised copy of federating manager
federatingManager = new FederatingManager(jmxAdapter, repo, system, this, cache);
- getGemFireCacheImpl().getJmxManagerAdvisor().broadcastChange();
+ getInternalCache().getJmxManagerAdvisor().broadcastChange();
return true;
}
}
@@ -519,7 +505,7 @@ public final class SystemManagementService extends BaseManagementService {
if (federatingManager != null) {
federatingManager.stopManager();
system.handleResourceEvent(ResourceEvent.MANAGER_STOP, null);
- getGemFireCacheImpl().getJmxManagerAdvisor().broadcastChange();
+ getInternalCache().getJmxManagerAdvisor().broadcastChange();
if (this.agent != null && (this.agent.isRunning() || this.agent.isHttpServiceRunning())) {
this.agent.stopAgent();
}
@@ -657,7 +643,6 @@ public final class SystemManagementService extends BaseManagementService {
return true;
}
-
public boolean afterPseudoCreateProxy(ObjectName objectName, Class interfaceClass,
Object proxyObject, FederationComponent newVal) {
for (ProxyListener listener : proxyListeners) {
@@ -688,8 +673,6 @@ public final class SystemManagementService extends BaseManagementService {
}
}
-
-
@Override
public <T> T getMBeanInstance(ObjectName objectName, Class<T> interfaceClass) {
if (jmxAdapter.isLocalMBean(objectName)) {
@@ -705,7 +688,6 @@ public final class SystemManagementService extends BaseManagementService {
}
}
-
public void memberJoined(InternalDistributedMember id) {
for (ProxyListener listener : proxyListeners) {
listener.memberJoined(id);
@@ -725,7 +707,6 @@ public final class SystemManagementService extends BaseManagementService {
}
}
-
public void quorumLost(Set<InternalDistributedMember> failures,
List<InternalDistributedMember> remaining) {
for (ProxyListener listener : proxyListeners) {
@@ -733,9 +714,7 @@ public final class SystemManagementService extends BaseManagementService {
}
}
-
-
- public class UniversalListenerContainer {
+ public static class UniversalListenerContainer {
private List<MembershipListener> membershipListeners =
new CopyOnWriteArrayList<MembershipListener>();
@@ -749,7 +728,6 @@ public final class SystemManagementService extends BaseManagementService {
logger.error("Could not invoke listener event memberJoined for listener[{}] due to ",
listener.getClass(), e.getMessage(), e);
}
-
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
index 54ac0c5..728402c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/CacheServerBridge.java
@@ -28,11 +28,8 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CqClosedException;
import org.apache.geode.cache.query.CqException;
-import org.apache.geode.cache.query.CqQuery;
-import org.apache.geode.cache.query.CqState;
import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.InternalCqQuery;
@@ -45,7 +42,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.ClientHealthMonitoringRegion;
import org.apache.geode.internal.admin.remote.ClientHealthStats;
import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.ha.HARegionQueue;
import org.apache.geode.internal.cache.tier.InternalClientMembership;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -70,8 +67,6 @@ import org.apache.geode.management.membership.ClientMembershipListener;
/**
* Represents the GemFire CacheServer . Provides data and notifications about server,
* subscriptions,durable queues and indices
- *
- *
*/
public class CacheServerBridge extends ServerBridge {
@@ -79,7 +74,7 @@ public class CacheServerBridge extends ServerBridge {
private CacheServer cacheServer;
- private GemFireCacheImpl cache;
+ private InternalCache cache;
private QueryService qs;
@@ -106,7 +101,7 @@ public class CacheServerBridge extends ServerBridge {
}
}
- public CacheServerBridge(CacheServer cacheServer, GemFireCacheImpl cache) {
+ public CacheServerBridge(CacheServer cacheServer, InternalCache cache) {
super(cacheServer);
this.cacheServer = cacheServer;
this.cache = cache;
@@ -306,7 +301,6 @@ public class CacheServerBridge extends ServerBridge {
}
/**
- *
* @return a list of client Ids connected to this particular server instance
*/
public String[] listClientIds() throws Exception {
@@ -323,10 +317,8 @@ public class CacheServerBridge extends ServerBridge {
} else {
return new String[0];
}
-
}
-
private Map<String, ClientConnInfo> getUniqueClientIds() {
Map<String, ClientConnInfo> uniqueIds = null;
@@ -401,7 +393,7 @@ public class CacheServerBridge extends ServerBridge {
}
public Version getClientVersion(ClientConnInfo connInfo) {
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
if (cache.getCacheServers().size() == 0) {
return null;
@@ -496,8 +488,7 @@ public class CacheServerBridge extends ServerBridge {
ClientHealthStatus status = new ClientHealthStatus();
- Region clientHealthMonitoringRegion =
- ClientHealthMonitoringRegion.getInstance((GemFireCacheImpl) cache);
+ Region clientHealthMonitoringRegion = ClientHealthMonitoringRegion.getInstance(this.cache);
String clientName = proxyId.getDSMembership();
status.setClientId(connInfo.toString());
status.setName(clientName);
@@ -530,7 +521,6 @@ public class CacheServerBridge extends ServerBridge {
return status;
}
-
/**
* closes a continuous query and releases all the resources associated with it.
*
@@ -550,7 +540,6 @@ public class CacheServerBridge extends ServerBridge {
} catch (CqException e) {
throw new Exception(e.getMessage());
}
-
}
}
}
@@ -576,7 +565,6 @@ public class CacheServerBridge extends ServerBridge {
}
}
}
-
}
/**
@@ -627,12 +615,10 @@ public class CacheServerBridge extends ServerBridge {
}
}
-
public int getIndexCount() {
return qs.getIndexes().size();
}
-
public int getNumClientNotificationRequests() {
return getStatistic(StatsKey.NUM_CLIENT_NOTIFICATION_REQUEST).intValue();
}
@@ -641,7 +627,6 @@ public class CacheServerBridge extends ServerBridge {
return clientNotificatioAvgLatency.getAverageLatency();
}
-
public float getClientNotificationRate() {
return clientNotificationRate.getRate();
}
@@ -654,7 +639,6 @@ public class CacheServerBridge extends ServerBridge {
return memberMBeanBridge.getTotalIndexMaintenanceTime();
}
-
public long getActiveCQCount() {
CqService cqService = cache.getCqService();
if (cqService != null && cqService.isRunning()) {
@@ -710,9 +694,7 @@ public class CacheServerBridge extends ServerBridge {
}
}
-
private ClientQueueDetail getClientQueueDetail(CacheClientProxy p) {
-
ClientQueueDetail queueDetail = new ClientQueueDetail();
ClientProxyMembershipID proxyID = p.getProxyID();
@@ -737,13 +719,7 @@ public class CacheServerBridge extends ServerBridge {
return queueDetail;
}
- /**
- *
- * @param clientId
- * @return stats for a given client ID
- */
public ClientQueueDetail getClientQueueDetail(String clientId) throws Exception {
-
try {
if (acceptor != null && acceptor.getCacheClientNotifier() != null) {
Collection<CacheClientProxy> clientProxies =
@@ -755,7 +731,6 @@ public class CacheServerBridge extends ServerBridge {
return queueDetail;
}
}
-
}
} catch (Exception e) {
throw new Exception(e.getMessage());
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 5b8c115..ef643ac 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
@@ -55,6 +55,7 @@ import org.apache.geode.internal.admin.remote.PrepareRevokePersistentIDRequest;
import org.apache.geode.internal.admin.remote.RevokePersistentIDRequest;
import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -97,10 +98,6 @@ import org.apache.geode.management.internal.cli.json.TypedJson;
*
* Operation strategy is not fixed. Some of the operations operate on local proxies. Some uses admin
* messaging for distributed message.
- *
- *
- *
- *
*/
public class DistributedSystemBridge {
@@ -154,7 +151,7 @@ public class DistributedSystemBridge {
/**
* Cache instance
*/
- private GemFireCacheImpl cache;
+ private InternalCache cache;
/**
* private instance of SystemManagementService
@@ -193,15 +190,12 @@ public class DistributedSystemBridge {
private GatewayReceiverClusterStatsMonitor receiverMonitor;
-
/**
* Distributed System level listener to listen on all the member level notifications It will then
* send the notification up the JMX layer in the name of DistributedSystemMBean.
*/
private DistributedSystemNotifListener distListener;
-
-
/**
* Static reference to the platform mbean server
*/
@@ -223,7 +217,6 @@ public class DistributedSystemBridge {
*/
private int queryCollectionsDepth = TypedJson.DEFAULT_COLLECTION_ELEMENT_LIMIT;
-
/**
* Helper method to get a member bean reference given a member name or id
*
@@ -237,7 +230,6 @@ public class DistributedSystemBridge {
} catch (ManagementException mx) {
return null;
}
-
}
/**
@@ -254,7 +246,7 @@ public class DistributedSystemBridge {
this.mapOfGatewaySenders = new ConcurrentHashMap<ObjectName, GatewaySenderMXBean>();
this.service = service;
this.cache = GemFireCacheImpl.getInstance();
- this.system = (InternalDistributedSystem) cache.getDistributedSystem();
+ this.system = cache.getInternalDistributedSystem();
this.dm = system.getDistributionManager();
this.alertLevel = ManagementConstants.DEFAULT_ALERT_LEVEL;
this.thisMemberName = MBeanJMXAdapter.getMemberMBeanName(system.getDistributedMember());
@@ -264,7 +256,6 @@ public class DistributedSystemBridge {
initClusterMonitors();
}
-
private void initClusterMonitors() {
this.memberMBeanMonitor = new MemberClusterStatsMonitor();
this.serverMBeanMonitor = new ServerClusterStatsMonitor();
@@ -305,9 +296,7 @@ public class DistributedSystemBridge {
}
logger.info(LocalizedMessage.create(ManagementStrings.INSTANCE_NOT_FOUND, objectName));
-
}
-
}
public void updateMember(ObjectName objectName, FederationComponent newState,
@@ -330,7 +319,6 @@ public class DistributedSystemBridge {
receiverMonitor.aggregate(newState, oldState);
}
-
/**
* Removed the proxy from the map.
*
@@ -353,7 +341,6 @@ public class DistributedSystemBridge {
if (mapOfMembers.values().size() == 0) {
memberSetSize = 0;
return true;
-
}
}
updateMember(objectName, null, oldState);
@@ -406,7 +393,6 @@ public class DistributedSystemBridge {
if (mapOfServers.values().size() == 0) {
serverSetSize = 0;
return true;
-
}
}
updateCacheServer(objectName, null, oldState);
@@ -444,7 +430,6 @@ public class DistributedSystemBridge {
if (mapOfGatewaySenders.values().size() == 0) {
gatewaySenderSetSize = 0;
return true;
-
}
}
updateGatewaySender(objectName, null, oldState);
@@ -482,7 +467,6 @@ public class DistributedSystemBridge {
if (mapOfGatewayReceivers.values().size() == 0) {
gatewayReceiverSetSize = 0;
return true;
-
}
}
updateGatewayReceiver(objectName, null, oldState);
@@ -513,7 +497,6 @@ public class DistributedSystemBridge {
baselineDir = new File(baselineDirPath);
}
-
DM dm = cache.getDistributionManager();
Set<PersistentID> missingMembers = MissingPersistentIDsRequest.send(dm);
Set recipients = dm.getOtherDistributionManagerIds();
@@ -558,7 +541,6 @@ public class DistributedSystemBridge {
setOfMissingDiskStr[j] = id.getDirectory();
j++;
}
-
}
}
@@ -576,7 +558,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return Minimum level for alerts to be delivered to listeners. Should be one of: WARNING,
* ERROR, SEVERE, OFF. It is not case-sensitive.
*/
@@ -616,7 +597,6 @@ public class DistributedSystemBridge {
throw new Exception("Unknown log-level \"" + alertLevel
+ "\". Valid levels are: WARNING, ERROR, SEVERE, NONE");
}
-
}
/**
@@ -637,7 +617,6 @@ public class DistributedSystemBridge {
return listOfServer.toArray(members);
}
return ManagementConstants.NO_DATA_STRING;
-
}
/**
@@ -676,7 +655,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return a list of Gateway Senders
*/
public String[] listGatwaySenders() {
@@ -711,7 +689,6 @@ public class DistributedSystemBridge {
if (bean != null) {
return bean;
} else {
-
throw new Exception(ManagementStrings.INVALID_MEMBER_NAME_OR_ID.toLocalizedString(member));
}
}
@@ -727,7 +704,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return the list of all locators present in the system
*/
public String[] listLocators() {
@@ -750,7 +726,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @param member name or id of the member
* @return GemFire configuration data
*/
@@ -774,7 +749,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return Lists all the members disk stores
*/
public Map<String, String[]> getMemberDiskstoreMap() {
@@ -785,7 +759,6 @@ public class DistributedSystemBridge {
while (memberIterator.hasNext()) {
MemberMXBean bean = memberIterator.next();
mapOfDisks.put(bean.getMember(), bean.getDiskStores());
-
}
return mapOfDisks;
@@ -794,19 +767,15 @@ public class DistributedSystemBridge {
}
/**
- *
* @param member name or id of the member
* @return for how long the member is up.
*/
public long getMemberUpTime(String member) throws Exception {
MemberMXBean bean = validateMember(member);
return bean.getMemberUpTime();
-
}
-
/**
- *
* @return list of members visible to the Managing node and which can be manageable.
*/
public String[] getMembers() {
@@ -876,7 +845,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return list of groups visible to the Manager node
*/
public String[] getGroups() {
@@ -909,7 +877,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @param member name or id of the member
* @return basic Opertaing metrics for a given member.
*/
@@ -919,7 +886,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return a list of region names hosted on the system
*/
public String[] listAllRegions() {
@@ -938,7 +904,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return a list of region names hosted on the system
*/
public String[] listAllRegionPaths() {
@@ -959,10 +924,8 @@ public class DistributedSystemBridge {
/**
- *
* @return the set of members successfully shutdown
*/
-
@SuppressWarnings("unchecked")
public String[] shutDownAllMembers() throws Exception {
try {
@@ -1069,7 +1032,6 @@ public class DistributedSystemBridge {
}
public ObjectName fetchDistributedRegionObjectName(String regionPath) throws Exception {
-
ObjectName distributedRegionMBeanName =
MBeanJMXAdapter.getDistributedRegionMbeanName(regionPath);
@@ -1078,11 +1040,9 @@ public class DistributedSystemBridge {
} else {
throw new Exception(ManagementStrings.DISTRIBUTED_REGION_MBEAN_NOT_FOUND_IN_DS.toString());
}
-
}
public ObjectName fetchRegionObjectName(String member, String regionPath) throws Exception {
-
validateMember(member);
ObjectName distributedRegionMBeanName =
@@ -1120,7 +1080,6 @@ public class DistributedSystemBridge {
}
public ObjectName[] listDistributedRegionObjectNames() {
-
List<ObjectName> list = new ArrayList<ObjectName>();
Iterator<ObjectName> it = distrRegionMap.keySet().iterator();
while (it.hasNext()) {
@@ -1131,7 +1090,6 @@ public class DistributedSystemBridge {
}
public ObjectName fetchCacheServerObjectName(String member, int port) throws Exception {
-
validateMember(member);
ObjectName serverName = MBeanJMXAdapter.getClientServiceMBeanName(port, member);
@@ -1145,12 +1103,10 @@ public class DistributedSystemBridge {
} else {
throw new Exception(ManagementStrings.CACHE_SERVER_MBEAN_NOT_FOUND_IN_DS.toString());
}
-
}
}
public ObjectName fetchDiskStoreObjectName(String member, String diskStore) throws Exception {
-
validateMember(member);
ObjectName diskStoreName = MBeanJMXAdapter.getDiskStoreMBeanName(member, diskStore);
@@ -1166,7 +1122,6 @@ public class DistributedSystemBridge {
} else {
throw new Exception(ManagementStrings.DISK_STORE_MBEAN_NOT_FOUND_IN_DS.toString());
}
-
}
public ObjectName fetchDistributedLockServiceObjectName(String lockServiceName) throws Exception {
@@ -1181,7 +1136,6 @@ public class DistributedSystemBridge {
}
public ObjectName fetchGatewayReceiverObjectName(String member) throws Exception {
-
validateMember(member);
ObjectName receiverName = MBeanJMXAdapter.getGatewayReceiverMBeanName(member);
GatewayReceiverMXBean bean =
@@ -1198,11 +1152,9 @@ public class DistributedSystemBridge {
ManagementStrings.GATEWAY_RECEIVER_MBEAN_NOT_FOUND_IN_SYSTEM.toString());
}
}
-
}
public ObjectName fetchGatewaySenderObjectName(String member, String senderId) throws Exception {
-
validateMember(member);
ObjectName senderName = MBeanJMXAdapter.getGatewaySenderMBeanName(member, senderId);
@@ -1219,11 +1171,9 @@ public class DistributedSystemBridge {
throw new Exception(ManagementStrings.GATEWAY_SENDER_MBEAN_NOT_FOUND_IN_SYSTEM.toString());
}
}
-
}
public ObjectName fetchLockServiceObjectName(String member, String lockService) throws Exception {
-
validateMember(member);
ObjectName lockServiceName = MBeanJMXAdapter.getLockServiceMBeanName(member, lockService);
@@ -1257,14 +1207,11 @@ public class DistributedSystemBridge {
}
public ObjectName[] listGatewaySenderObjectNames(String member) throws Exception {
-
validateMember(member);
DistributedMember distributedMember = BeanUtilFuncs.getDistributedMemberByNameOrId(member);
-
List<ObjectName> listName = null;
-
ObjectName pattern = new ObjectName(ManagementConstants.GATEWAY_SENDER_PATTERN);
Set<ObjectName> mbeanSet = service.queryMBeanNames(distributedMember);
@@ -1285,8 +1232,6 @@ public class DistributedSystemBridge {
return ManagementConstants.NO_DATA_OBJECTNAME;
}
- /** Statistics Attributes **/
-
/**
* We have to iterate through the Cache servers to get Unique Client list across system. Stats
* will give duplicate client numbers;
@@ -1294,7 +1239,6 @@ public class DistributedSystemBridge {
* @return total number of client vm connected to the system
*/
public int getNumClients() {
-
if (mapOfServers.keySet().size() > 0) {
Set<String> uniqueClientSet = new HashSet<String>();
Iterator<CacheServerMXBean> it = mapOfServers.values().iterator();
@@ -1312,7 +1256,6 @@ public class DistributedSystemBridge {
uniqueClientSet.add(client);
}
}
-
}
return uniqueClientSet.size();
}
@@ -1320,7 +1263,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total number of query running
*/
public long getActiveCQCount() {
@@ -1328,7 +1270,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return average query request rate
*/
public float getQueryRequestRate() {
@@ -1336,7 +1277,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return rate of disk reads
*/
public float getDiskReadsRate() {
@@ -1344,7 +1284,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return rate of disk writes
*/
public float getDiskWritesRate() {
@@ -1352,7 +1291,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return disk flush avg latency
*/
public long getDiskFlushAvgLatency() {
@@ -1372,7 +1310,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return average events received rate across system
*/
public float getGatewayReceiverEventsReceivedRate() {
@@ -1380,26 +1317,21 @@ public class DistributedSystemBridge {
}
/**
- *
* @return Average number of batches of events removed from the event queue and sent per second
*/
public long getGatewaySenderAverageDistributionTimePerBatch() {
return MetricsCalculator.getAverage(
senderMonitor.getGatewaySenderAverageDistributionTimePerBatch(), gatewaySenderSetSize);
-
}
/**
- *
* @return average gateway sender batch dispatch rate
*/
public float getGatewaySenderBatchesDispatchedRate() {
return senderMonitor.getGatewaySenderBatchesDispatchedRate();
-
}
/**
- *
* @return event queue size
*/
public int getGatewaySenderEventQueueSize() {
@@ -1407,7 +1339,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return events queued rate
*/
public float getGatewaySenderEventsQueuedRate() {
@@ -1415,7 +1346,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total batches redistributed
*/
public int getGatewaySenderTotalBatchesRedistributed() {
@@ -1423,16 +1353,13 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total number of events conflated
*/
public int getGatewaySenderTotalEventsConflated() {
return senderMonitor.getGatewaySenderTotalEventsConflated();
}
-
/**
- *
* @return the total count of disk stores present in the system
*/
public int getSystemDiskStoreCount() {
@@ -1440,7 +1367,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total number of disk back up going on across system
*/
public int getTotalBackupInProgress() {
@@ -1448,19 +1374,16 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total heap size occupied by the DS
*/
public long getTotalHeapSize() {
return memberMBeanMonitor.getTotalHeapSize();
}
-
public long getOffHeapFreeSize() {
return memberMBeanMonitor.getOffHeapFreeMemory();
}
-
public long getOffHeapUsedSize() {
return memberMBeanMonitor.getOffHeapUsedMemory();
}
@@ -1474,7 +1397,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total hit count across DS
*/
public int getTotalHitCount() {
@@ -1482,7 +1404,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total miss count across the system
*/
public int getTotalMissCount() {
@@ -1490,7 +1411,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return number of regions
*/
public int getTotalRegionCount() {
@@ -1498,7 +1418,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return total number of region entries
*/
public long getTotalRegionEntryCount() {
@@ -1514,7 +1433,6 @@ public class DistributedSystemBridge {
}
/**
- *
* @return Number of Initial image operations that are in progress across system
*/
public int getNumInitialImagesInProgress() {
@@ -1535,7 +1453,6 @@ public class DistributedSystemBridge {
public float getAverageReads() {
return memberMBeanMonitor.getAverageReads();
-
}
public float getAverageWrites() {
@@ -1576,12 +1493,10 @@ public class DistributedSystemBridge {
return Collections.emptyMap();
}
-
public String queryData(String query, String members, int limit) throws Exception {
Object result = QueryDataFunction.queryData(query, members, limit, false, queryResultSetLimit,
queryCollectionsDepth);
return (String) result;
-
}
public byte[] queryDataForCompressedResult(String query, String members, int limit)
@@ -1589,10 +1504,8 @@ public class DistributedSystemBridge {
Object result = QueryDataFunction.queryData(query, members, limit, true, queryResultSetLimit,
queryCollectionsDepth);
return (byte[]) result;
-
}
-
public int getQueryResultSetLimit() {
return queryResultSetLimit;
}
@@ -1609,20 +1522,15 @@ public class DistributedSystemBridge {
this.queryCollectionsDepth = queryCollectionsDepth;
}
-
/**
* User defined notification handler
- *
- *
*/
private class DistributedSystemNotifListener implements NotificationListener {
@Override
public void handleNotification(Notification notification, Object handback) {
-
notification.setSequenceNumber(SequenceNumber.next());
systemLevelNotifEmitter.sendNotification(notification);
-
}
}
@@ -1737,7 +1645,6 @@ public class DistributedSystemBridge {
return;
}
}
-
}
public void updateLockService(ObjectName proxyName, FederationComponent oldValue,
@@ -1748,31 +1655,25 @@ public class DistributedSystemBridge {
}
public void memberDeparted(InternalDistributedMember id, boolean crashed) {
-
Notification notification = new Notification(JMXNotificationType.CACHE_MEMBER_DEPARTED,
MBeanJMXAdapter.getMemberNameOrId(id), SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.CACHE_MEMBER_DEPARTED_PREFIX + MBeanJMXAdapter.getMemberNameOrId(id)
+ " has crashed = " + crashed);
systemLevelNotifEmitter.sendNotification(notification);
-
}
public void memberJoined(InternalDistributedMember id) {
-
Notification notification = new Notification(JMXNotificationType.CACHE_MEMBER_JOINED,
MBeanJMXAdapter.getMemberNameOrId(id), SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.CACHE_MEMBER_JOINED_PREFIX + MBeanJMXAdapter.getMemberNameOrId(id));
systemLevelNotifEmitter.sendNotification(notification);
-
}
public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected) {
-
Notification notification = new Notification(JMXNotificationType.CACHE_MEMBER_SUSPECT,
MBeanJMXAdapter.getMemberNameOrId(id), SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.CACHE_MEMBER_SUSPECT_PREFIX + MBeanJMXAdapter.getMemberNameOrId(id)
+ " By : " + whoSuspected.getName());
systemLevelNotifEmitter.sendNotification(notification);
-
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
index 33b3175..1597f9f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -30,23 +31,15 @@ import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.management.internal.ManagementStrings;
-
-/**
- *
- *
- */
public class LocatorMBeanBridge {
private static final Logger logger = LogService.getLogger();
private Locator loc;
- private InternalDistributedSystem system;
-
- private GemFireCacheImpl cache;
+ private InternalCache cache;
public LocatorMBeanBridge(Locator loc) {
this.loc = loc;
- this.system = (InternalDistributedSystem) loc.getDistributedSystem();
this.cache = GemFireCacheImpl.getInstance();
}
@@ -54,27 +47,22 @@ public class LocatorMBeanBridge {
return loc.getBindAddress().getCanonicalHostName();
}
-
public String getHostnameForClients() {
return loc.getHostnameForClients();
}
-
public String viewLog() {
return fetchLog(loc.getLogFile(), ManagementConstants.DEFAULT_SHOW_LOG_LINES);
}
-
public int getPort() {
return loc.getPort();
}
-
public boolean isPeerLocator() {
return true;
}
-
public boolean isServerLocator() {
return true;
}
@@ -114,11 +102,9 @@ public class LocatorMBeanBridge {
}
/**
- *
* @return log of the locator.
*/
private String fetchLog(File logFile, int numLines) {
-
if (numLines > ManagementConstants.MAX_SHOW_LOG_LINES) {
numLines = ManagementConstants.MAX_SHOW_LOG_LINES;
}
@@ -127,7 +113,6 @@ public class LocatorMBeanBridge {
}
String mainTail = null;
try {
- InternalDistributedSystem sys = system;
mainTail = BeanUtilFuncs.tailSystemLog(logFile, numLines);
if (mainTail == null) {
mainTail =
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 1dc90dc..7dce602 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
@@ -47,7 +47,7 @@ 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.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.logging.LogService;
@@ -82,9 +82,6 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
*
* Even though this class have a lot of utility functions it interacts with the state of the system
* and contains some state itself.
- *
- *
- *
*/
public class ManagementAdapter {
@@ -94,7 +91,7 @@ public class ManagementAdapter {
private SystemManagementService service;
/** GemFire Cache impl **/
- private GemFireCacheImpl cacheImpl;
+ private InternalCache internalCache;
/** Member Name **/
private String memberSource;
@@ -104,26 +101,20 @@ public class ManagementAdapter {
**/
private NotificationBroadcasterSupport memberLevelNotifEmitter;
-
/** The <code>MBeanServer</code> for this application */
public static final MBeanServer mbeanServer = MBeanJMXAdapter.mbeanServer;
-
/** MemberMBean instance **/
private MemberMBean memberBean;
-
-
private volatile boolean serviceInitialised = false;
private MBeanAggregator aggregator;
public static final List<Class> refreshOnInit = new ArrayList<Class>();
-
public static final List<String> internalLocks = new ArrayList<String>();
-
static {
refreshOnInit.add(RegionMXBean.class);
refreshOnInit.add(MemberMXBean.class);
@@ -132,37 +123,33 @@ public class ManagementAdapter {
internalLocks.add(DLockService.LTLS); // From reserved lock service name
internalLocks.add(PartitionedRegionHelper.PARTITION_LOCK_SERVICE_NAME);
internalLocks.add(PeerTypeRegistration.LOCK_SERVICE_NAME);
-
}
protected MemberMBeanBridge memberMBeanBridge;
private final Object regionOpLock = new Object();
-
-
/**
* Adapter life cycle is tied with the Cache . So its better to make all cache level artifacts as
* instance variable
- *
+ *
* @param cache gemfire cache
*/
- public void handleCacheCreation(GemFireCacheImpl cache) throws ManagementException {
+ public void handleCacheCreation(InternalCache cache) throws ManagementException {
try {
- this.cacheImpl = (GemFireCacheImpl) cache;
- this.service = (SystemManagementService) ManagementService.getManagementService(cacheImpl);
+ this.internalCache = cache;
+ this.service =
+ (SystemManagementService) ManagementService.getManagementService(internalCache);
- this.memberMBeanBridge = new MemberMBeanBridge(cacheImpl, service).init();
+ this.memberMBeanBridge = new MemberMBeanBridge(internalCache, service).init();
this.memberBean = new MemberMBean(memberMBeanBridge);
this.memberLevelNotifEmitter = memberBean;
ObjectName memberMBeanName = MBeanJMXAdapter.getMemberMBeanName(
InternalDistributedSystem.getConnectedInstance().getDistributedMember());
-
memberSource = MBeanJMXAdapter
- .getMemberNameOrId(cacheImpl.getDistributedSystem().getDistributedMember());
-
+ .getMemberNameOrId(internalCache.getDistributedSystem().getDistributedMember());
// Type casting to MemberMXBean to expose only those methods described in
// the interface;
@@ -170,21 +157,17 @@ public class ManagementAdapter {
service.registerInternalMBean((MemberMXBean) memberBean, memberMBeanName);
service.federate(changedMBeanName, MemberMXBean.class, true);
-
-
this.serviceInitialised = true;
// Service initialised is only for ManagementService and not necessarily
// Manager service.
-
- /** For situations where locator is created before any cache is created **/
+ // For situations where locator is created before any cache is created
if (InternalLocator.hasLocator()) {
Locator loc = InternalLocator.getLocator();
handleLocatorStart(loc);
}
-
if (cache.getInternalDistributedSystem().getConfig().getJmxManager()) {
this.service.createManager();
if (cache.getInternalDistributedSystem().getConfig().getJmxManagerStart()) {
@@ -206,7 +189,6 @@ public class ManagementAdapter {
}
}
-
}
/**
@@ -224,7 +206,7 @@ public class ManagementAdapter {
// register the aggregator for Federation framework to use
service.addProxyListener(aggregator);
- /**
+ /*
* get the local member mbean as it need to be provided to aggregator first
*/
@@ -269,10 +251,7 @@ public class ManagementAdapter {
}
throw new ManagementException(e);
}
-
}
-
-
}
/**
@@ -336,7 +315,6 @@ public class ManagementAdapter {
logger.warn("Failed to invoke aggregator for {} with exception {}", objectName,
e.getMessage(), e);
}
-
}
service.removeProxyListener(this.aggregator);
this.aggregator = null;
@@ -344,7 +322,6 @@ public class ManagementAdapter {
/**
* Assumption is always cache and MemberMbean has been will be created first
- *
*/
public void handleManagerCreation() throws ManagementException {
if (!isServiceInitialised("handleManagerCreation")) {
@@ -358,7 +335,6 @@ public class ManagementAdapter {
ManagerMXBean bean = new ManagerMBean(bridge);
service.registerInternalMBean(bean, managerMBeanName);
-
}
/**
@@ -380,12 +356,12 @@ public class ManagementAdapter {
if (localRegion.isDestroyed()) {
return;
}
- /** Bridge is responsible for extracting data from GemFire Layer **/
+ // Bridge is responsible for extracting data from GemFire Layer
RegionMBeanBridge<K, V> bridge = RegionMBeanBridge.getInstance(region);
RegionMXBean regionMBean = new RegionMBean<K, V>(bridge);
ObjectName regionMBeanName = MBeanJMXAdapter.getRegionMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), region.getFullPath());
+ internalCache.getDistributedSystem().getDistributedMember(), region.getFullPath());
ObjectName changedMBeanName = service.registerInternalMBean(regionMBean, regionMBeanName);
service.federate(changedMBeanName, RegionMXBean.class, true);
@@ -394,11 +370,7 @@ public class ManagementAdapter {
ManagementConstants.REGION_CREATED_PREFIX + region.getFullPath());
memberLevelNotifEmitter.sendNotification(notification);
memberMBeanBridge.addRegion(region);
-
-
}
-
-
}
/**
@@ -413,7 +385,7 @@ public class ManagementAdapter {
DiskStoreMBeanBridge bridge = new DiskStoreMBeanBridge(disk);
DiskStoreMXBean diskStoreMBean = new DiskStoreMBean(bridge);
ObjectName diskStoreMBeanName = MBeanJMXAdapter.getDiskStoreMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), disk.getName());
+ internalCache.getDistributedSystem().getDistributedMember(), disk.getName());
ObjectName changedMBeanName = service.registerInternalMBean(diskStoreMBean, diskStoreMBeanName);
service.federate(changedMBeanName, DiskStoreMXBean.class, true);
@@ -425,7 +397,6 @@ public class ManagementAdapter {
memberMBeanBridge.addDiskStore(disk);
}
-
/**
* Handles LockService Creation
*
@@ -435,7 +406,7 @@ public class ManagementAdapter {
if (!isServiceInitialised("handleLockServiceCreation")) {
return;
}
- /** Internal Locks Should not be exposed to client for monitoring **/
+ // Internal Locks Should not be exposed to client for monitoring
if (internalLocks.contains(lockService.getName())) {
return;
}
@@ -443,7 +414,7 @@ public class ManagementAdapter {
LockServiceMXBean lockServiceMBean = new LockServiceMBean(bridge);
ObjectName lockServiceMBeanName = MBeanJMXAdapter.getLockServiceMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), lockService.getName());
+ internalCache.getDistributedSystem().getDistributedMember(), lockService.getName());
ObjectName changedMBeanName =
service.registerInternalMBean(lockServiceMBean, lockServiceMBeanName);
@@ -472,7 +443,7 @@ public class ManagementAdapter {
GatewaySenderMXBean senderMBean = new GatewaySenderMBean(bridge);
ObjectName senderObjectName = MBeanJMXAdapter.getGatewaySenderMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), sender.getId());
+ internalCache.getDistributedSystem().getDistributedMember(), sender.getId());
ObjectName changedMBeanName = service.registerInternalMBean(senderMBean, senderObjectName);
@@ -482,7 +453,6 @@ public class ManagementAdapter {
memberSource, SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.GATEWAY_SENDER_CREATED_PREFIX);
memberLevelNotifEmitter.sendNotification(notification);
-
}
/**
@@ -500,7 +470,6 @@ public class ManagementAdapter {
}
createGatewayReceiverMBean(recv);
-
}
private void createGatewayReceiverMBean(GatewayReceiver recv) {
@@ -508,7 +477,7 @@ public class ManagementAdapter {
GatewayReceiverMXBean receiverMBean = new GatewayReceiverMBean(bridge);
ObjectName recvObjectName = MBeanJMXAdapter
- .getGatewayReceiverMBeanName(cacheImpl.getDistributedSystem().getDistributedMember());
+ .getGatewayReceiverMBeanName(internalCache.getDistributedSystem().getDistributedMember());
ObjectName changedMBeanName = service.registerInternalMBean(receiverMBean, recvObjectName);
@@ -518,10 +487,8 @@ public class ManagementAdapter {
memberSource, SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.GATEWAY_RECEIVER_CREATED_PREFIX);
memberLevelNotifEmitter.sendNotification(notification);
-
}
-
/**
* Handles Gateway receiver creation
*
@@ -546,10 +513,8 @@ public class ManagementAdapter {
memberSource, SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.GATEWAY_RECEIVER_STARTED_PREFIX);
memberLevelNotifEmitter.sendNotification(notification);
-
}
-
/**
* Handles Gateway receiver creation
*
@@ -569,7 +534,6 @@ public class ManagementAdapter {
memberSource, SequenceNumber.next(), System.currentTimeMillis(),
ManagementConstants.GATEWAY_RECEIVER_STOPPED_PREFIX);
memberLevelNotifEmitter.sendNotification(notification);
-
}
public void handleAsyncEventQueueCreation(AsyncEventQueue queue) throws ManagementException {
@@ -579,7 +543,7 @@ public class ManagementAdapter {
AsyncEventQueueMBeanBridge bridge = new AsyncEventQueueMBeanBridge(queue);
AsyncEventQueueMXBean queueMBean = new AsyncEventQueueMBean(bridge);
ObjectName senderObjectName = MBeanJMXAdapter.getAsycnEventQueueMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), queue.getId());
+ internalCache.getDistributedSystem().getDistributedMember(), queue.getId());
ObjectName changedMBeanName = service.registerInternalMBean(queueMBean, senderObjectName);
@@ -602,7 +566,7 @@ public class ManagementAdapter {
}
ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsycnEventQueueMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), queue.getId());
+ internalCache.getDistributedSystem().getDistributedMember(), queue.getId());
AsyncEventQueueMBean bean = null;
try {
bean = (AsyncEventQueueMBean) service.getLocalAsyncEventQueueMXBean(queue.getId());
@@ -649,7 +613,6 @@ public class ManagementAdapter {
notification.setUserData(userData);
service.handleNotification(notification);
}
-
}
private Map<String, String> prepareUserData(AlertDetails details) {
@@ -657,13 +620,11 @@ public class ManagementAdapter {
userData.put(JMXNotificationUserData.ALERT_LEVEL,
AlertDetails.getAlertLevelAsString(details.getAlertLevel()));
-
String source = details.getSource();
userData.put(JMXNotificationUserData.THREAD, source);
InternalDistributedMember sender = details.getSender();
- String nameOrId = memberSource; // TODO Rishi/Abhishek - what if sender is
- // null?
+ String nameOrId = memberSource; // TODO: what if sender is null?
if (sender != null) {
nameOrId = sender.getName();
nameOrId = nameOrId != null && !nameOrId.trim().isEmpty() ? nameOrId : sender.getId();
@@ -684,13 +645,13 @@ public class ManagementAdapter {
return;
}
- CacheServerBridge cacheServerBridge = new CacheServerBridge(cacheServer, cacheImpl);
+ CacheServerBridge cacheServerBridge = new CacheServerBridge(cacheServer, internalCache);
cacheServerBridge.setMemberMBeanBridge(memberMBeanBridge);
CacheServerMBean cacheServerMBean = new CacheServerMBean(cacheServerBridge);
ObjectName cacheServerMBeanName = MBeanJMXAdapter.getClientServiceMBeanName(
- cacheServer.getPort(), cacheImpl.getDistributedSystem().getDistributedMember());
+ cacheServer.getPort(), internalCache.getDistributedSystem().getDistributedMember());
ObjectName changedMBeanName =
service.registerInternalMBean((CacheServerMXBean) cacheServerMBean, cacheServerMBeanName);
@@ -710,7 +671,6 @@ public class ManagementAdapter {
memberLevelNotifEmitter.sendNotification(notification);
memberMBeanBridge.setCacheServer(true);
-
}
/**
@@ -731,11 +691,10 @@ public class ManagementAdapter {
ClientMembership.unregisterClientMembershipListener(listener);
}
-
mbean.stopMonitor();
ObjectName cacheServerMBeanName = MBeanJMXAdapter.getClientServiceMBeanName(server.getPort(),
- cacheImpl.getDistributedSystem().getDistributedMember());
+ internalCache.getDistributedSystem().getDistributedMember());
service.unregisterMBean(cacheServerMBeanName);
Notification notification = new Notification(JMXNotificationType.CACHE_SERVER_STOPPED,
@@ -745,7 +704,6 @@ public class ManagementAdapter {
memberLevelNotifEmitter.sendNotification(notification);
memberMBeanBridge.setCacheServer(false);
-
}
/**
@@ -757,6 +715,7 @@ public class ManagementAdapter {
if (!isServiceInitialised("handleCacheRemoval")) {
return;
}
+
this.serviceInitialised = false;
try {
cleanUpMonitors();
@@ -765,32 +724,28 @@ public class ManagementAdapter {
if (logger.isDebugEnabled()) {
logger.debug(e.getMessage(), e);
}
-
}
+
try {
service.close();
-
} catch (Exception e) {
logger.warn(e.getMessage(), e);
} finally {
- this.cacheImpl = null;
+ this.internalCache = null;
this.service = null;
this.memberMBeanBridge = null;
this.memberBean = null;
this.memberLevelNotifEmitter = null;
-
-
}
}
private void cleanUpMonitors() {
-
MemberMBean bean = (MemberMBean) service.getMemberMXBean();
if (bean != null) {
bean.stopMonitor();
}
- Set<GatewaySender> senders = cacheImpl.getGatewaySenders();
+ Set<GatewaySender> senders = internalCache.getGatewaySenders();
if (senders != null && senders.size() > 0) {
for (GatewaySender sender : senders) {
@@ -808,9 +763,8 @@ public class ManagementAdapter {
}
}
-
private void cleanBridgeResources() {
- List<CacheServer> servers = cacheImpl.getCacheServers();
+ List<CacheServer> servers = internalCache.getCacheServers();
if (servers != null && servers.size() > 0) {
for (CacheServer server : servers) {
@@ -824,7 +778,6 @@ public class ManagementAdapter {
ClientMembership.unregisterClientMembershipListener(listener);
}
}
-
}
}
}
@@ -838,15 +791,14 @@ public class ManagementAdapter {
if (!isServiceInitialised("handleRegionRemoval")) {
return;
}
- /**
+ /*
* Moved region remove operation to a guarded block. If a region is getting created it wont
* allow it to destroy any region.
*/
synchronized (regionOpLock) {
-
ObjectName regionMBeanName = MBeanJMXAdapter.getRegionMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), region.getFullPath());
+ internalCache.getDistributedSystem().getDistributedMember(), region.getFullPath());
RegionMBean bean = null;
try {
bean = (RegionMBean) service.getLocalRegionMBean(region.getFullPath());
@@ -871,7 +823,6 @@ public class ManagementAdapter {
memberLevelNotifEmitter.sendNotification(notification);
memberMBeanBridge.removeRegion(region);
}
-
}
/**
@@ -880,13 +831,12 @@ public class ManagementAdapter {
* @param disk
*/
public void handleDiskRemoval(DiskStore disk) throws ManagementException {
-
if (!isServiceInitialised("handleDiskRemoval")) {
return;
}
ObjectName diskStoreMBeanName = MBeanJMXAdapter.getDiskStoreMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), disk.getName());
+ internalCache.getDistributedSystem().getDistributedMember(), disk.getName());
DiskStoreMBean bean = null;
try {
@@ -913,20 +863,18 @@ public class ManagementAdapter {
memberMBeanBridge.removeDiskStore(disk);
}
-
/**
* Handles Lock Service Removal
*
* @param lockService lock service instance
*/
public void handleLockServiceRemoval(DLockService lockService) throws ManagementException {
-
if (!isServiceInitialised("handleLockServiceRemoval")) {
return;
}
ObjectName lockServiceMBeanName = MBeanJMXAdapter.getLockServiceMBeanName(
- cacheImpl.getDistributedSystem().getDistributedMember(), lockService.getName());
+ internalCache.getDistributedSystem().getDistributedMember(), lockService.getName());
LockServiceMXBean bean = service.getLocalLockServiceMBean(lockService.getName());
@@ -954,7 +902,7 @@ public class ManagementAdapter {
}
ObjectName locatorMBeanName = MBeanJMXAdapter
- .getLocatorMBeanName(cacheImpl.getDistributedSystem().getDistributedMember());
+ .getLocatorMBeanName(internalCache.getDistributedSystem().getDistributedMember());
LocatorMBeanBridge bridge = new LocatorMBeanBridge(locator);
LocatorMBean locatorMBean = new LocatorMBean(bridge);
@@ -989,7 +937,6 @@ public class ManagementAdapter {
ManagementConstants.GATEWAY_SENDER_STARTED_PREFIX + sender.getId());
memberLevelNotifEmitter.sendNotification(notification);
-
}
public void handleGatewaySenderStop(GatewaySender sender) throws ManagementException {
@@ -1002,7 +949,6 @@ public class ManagementAdapter {
ManagementConstants.GATEWAY_SENDER_STOPPED_PREFIX + sender.getId());
memberLevelNotifEmitter.sendNotification(notification);
-
}
public void handleGatewaySenderPaused(GatewaySender sender) throws ManagementException {
@@ -1015,7 +961,6 @@ public class ManagementAdapter {
ManagementConstants.GATEWAY_SENDER_PAUSED_PREFIX + sender.getId());
memberLevelNotifEmitter.sendNotification(notification);
-
}
public void handleGatewaySenderResumed(GatewaySender sender) throws ManagementException {
@@ -1028,7 +973,6 @@ public class ManagementAdapter {
ManagementConstants.GATEWAY_SENDER_RESUMED_PREFIX + sender.getId());
memberLevelNotifEmitter.sendNotification(notification);
-
}
public void handleCacheServiceCreation(CacheService cacheService) throws ManagementException {
@@ -1037,7 +981,7 @@ public class ManagementAdapter {
}
// Don't register the CacheServices in the Locator
InternalDistributedMember member =
- cacheImpl.getInternalDistributedSystem().getDistributedMember();
+ internalCache.getInternalDistributedSystem().getDistributedMember();
if (member.getVmKind() == DistributionManager.LOCATOR_DM_TYPE) {
return;
}
@@ -1061,7 +1005,6 @@ public class ManagementAdapter {
* Private class which acts as a ClientMembershipListener to propagate client joined/left
* notifications
*/
-
private static class CacheServerMembershipListenerAdapter
extends ClientMembershipListenerAdapter {
@@ -1088,7 +1031,6 @@ public class ManagementAdapter {
ManagementConstants.CLIENT_JOINED_PREFIX + event.getMemberId());
serverLevelNotifEmitter.sendNotification(notification);
memberLevelNotifEmitter.sendNotification(notification);
-
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
index d841122..fa93f6c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementListener.java
@@ -29,14 +29,12 @@ import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.cache.CacheService;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.ManagementException;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.AlertDetails;
/**
* This Listener listens on various resource creation in GemFire and create/destroys GemFire
* specific MBeans accordingly
- *
- *
*/
public class ManagementListener implements ResourceEventsListener {
@@ -51,10 +49,8 @@ public class ManagementListener implements ResourceEventsListener {
* Constructor
*/
public ManagementListener() {
-
this.adapter = new ManagementAdapter();
this.logger = InternalDistributedSystem.getLoggerI18n();
-
}
/**
@@ -82,7 +78,7 @@ public class ManagementListener implements ResourceEventsListener {
return false;
}
- GemFireCacheImpl currentCache = GemFireCacheImpl.getInstance();
+ InternalCache currentCache = GemFireCacheImpl.getInstance();
if (currentCache == null) {
return false;
}
@@ -92,14 +88,11 @@ public class ManagementListener implements ResourceEventsListener {
return true;
}
-
-
/**
* Handles various GFE resource life-cycle methods vis-a-vis Management and Monitoring
*
* It checks for race conditions cases by calling shouldProceed();
- *
- *
+ *
* @param event Management event for which invocation has happened
* @param resource the GFE resource type
*/
@@ -109,11 +102,11 @@ public class ManagementListener implements ResourceEventsListener {
}
switch (event) {
case CACHE_CREATE:
- GemFireCacheImpl createdCache = (GemFireCacheImpl) resource;
+ InternalCache createdCache = (InternalCache) resource;
adapter.handleCacheCreation(createdCache);
break;
case CACHE_REMOVE:
- GemFireCacheImpl removedCache = (GemFireCacheImpl) resource;
+ InternalCache removedCache = (InternalCache) resource;
adapter.handleCacheRemoval(removedCache);
break;
case REGION_CREATE:
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
index f6450f7..516b97d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
@@ -14,7 +14,33 @@
*/
package org.apache.geode.management.internal.beans;
-import static org.apache.geode.internal.lang.SystemUtils.getLineSeparator;
+import static org.apache.geode.internal.lang.SystemUtils.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.management.JMRuntimeException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.logging.log4j.Logger;
import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
@@ -28,11 +54,26 @@ import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.ServerLauncher;
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionStats;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.distributed.internal.locks.DLockStats;
-import org.apache.geode.internal.*;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.PureJavaMode;
+import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.cache.DirectoryHolder;
+import org.apache.geode.internal.cache.DiskDirectoryStats;
+import org.apache.geode.internal.cache.DiskRegion;
+import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.DiskStoreStats;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionStats;
import org.apache.geode.internal.cache.control.ResourceManagerStats;
import org.apache.geode.internal.cache.execute.FunctionServiceStats;
import org.apache.geode.internal.cache.lru.LRUStatistics;
@@ -50,46 +91,45 @@ import org.apache.geode.internal.process.PidUnavailableException;
import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.internal.statistics.GemFireStatSampler;
import org.apache.geode.internal.statistics.HostStatHelper;
+import org.apache.geode.internal.statistics.StatSamplerStats;
+import org.apache.geode.internal.statistics.VMStatsContract;
import org.apache.geode.internal.statistics.platform.LinuxSystemStats;
import org.apache.geode.internal.statistics.platform.ProcessStats;
import org.apache.geode.internal.statistics.platform.SolarisSystemStats;
-import org.apache.geode.internal.statistics.StatSamplerStats;
-import org.apache.geode.internal.statistics.VMStatsContract;
import org.apache.geode.internal.statistics.platform.WindowsSystemStats;
import org.apache.geode.internal.stats50.VMStats50;
import org.apache.geode.internal.tcp.ConnectionTable;
-import org.apache.geode.management.*;
+import org.apache.geode.management.DependenciesNotFoundException;
+import org.apache.geode.management.DiskBackupResult;
+import org.apache.geode.management.GemFireProperties;
+import org.apache.geode.management.JVMMetrics;
+import org.apache.geode.management.ManagementException;
+import org.apache.geode.management.OSMetrics;
import org.apache.geode.management.cli.CommandService;
import org.apache.geode.management.cli.CommandServiceException;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.ManagementConstants;
import org.apache.geode.management.internal.ManagementStrings;
import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.management.internal.beans.stats.*;
+import org.apache.geode.management.internal.beans.stats.AggregateRegionStatsMonitor;
+import org.apache.geode.management.internal.beans.stats.GCStatsMonitor;
+import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
+import org.apache.geode.management.internal.beans.stats.MemberLevelDiskMonitor;
+import org.apache.geode.management.internal.beans.stats.StatType;
+import org.apache.geode.management.internal.beans.stats.StatsAverageLatency;
+import org.apache.geode.management.internal.beans.stats.StatsKey;
+import org.apache.geode.management.internal.beans.stats.StatsLatency;
+import org.apache.geode.management.internal.beans.stats.StatsRate;
+import org.apache.geode.management.internal.beans.stats.VMStatsMonitor;
import org.apache.geode.management.internal.cli.CommandResponseBuilder;
import org.apache.geode.management.internal.cli.remote.CommandExecutionContext;
import org.apache.geode.management.internal.cli.remote.MemberCommandService;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.logging.log4j.Logger;
-
-import javax.management.JMRuntimeException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.io.File;
-import java.io.IOException;
-import java.lang.management.*;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
/**
* This class acts as an Bridge between MemberMBean and GemFire Cache and Distributed System
- *
- *
*/
public class MemberMBeanBridge {
@@ -108,7 +148,7 @@ public class MemberMBeanBridge {
private static TimeUnit nanoSeconds = TimeUnit.NANOSECONDS;
/** Cache Instance **/
- private GemFireCacheImpl cache;
+ private InternalCache cache;
/** Distribution Config **/
private DistributionConfig config;
@@ -130,6 +170,7 @@ public class MemberMBeanBridge {
* Command Service
*/
private CommandService commandService;
+
private String commandServiceInitError;
/**
@@ -150,10 +191,8 @@ public class MemberMBeanBridge {
/**
* Reference to JDK bean OperatingSystemMXBean
*/
-
private OperatingSystemMXBean osBean;
-
/**
* Host name of the member
*/
@@ -189,7 +228,6 @@ public class MemberMBeanBridge {
private AggregateRegionStatsMonitor regionMonitor;
-
private StatsRate createsRate;
private StatsRate bytesReceivedRate;
@@ -268,8 +306,6 @@ public class MemberMBeanBridge {
private MBeanStatsMonitor systemStatsMonitor;
-
-
private float instCreatesRate = 0;
private float instGetsRate = 0;
@@ -291,7 +327,7 @@ public class MemberMBeanBridge {
private ResourceManagerStats resourceManagerStats;
- public MemberMBeanBridge(GemFireCacheImpl cache, SystemManagementService service) {
+ public MemberMBeanBridge(InternalCache cache, SystemManagementService service) {
this.cache = cache;
this.service = service;
@@ -305,7 +341,6 @@ public class MemberMBeanBridge {
.getRedundancyZone(cache.getInternalDistributedSystem().getDistributedMember());
}
-
this.sampler = system.getStatSampler();
this.config = system.getConfig();
@@ -354,7 +389,6 @@ public class MemberMBeanBridge {
this.runtimeMXBean = ManagementFactory.getRuntimeMXBean();
this.osBean = ManagementFactory.getOperatingSystemMXBean();
-
// Initialize all the Stats Monitors
this.monitor =
new MBeanStatsMonitor(ManagementStrings.MEMBER_CACHE_MONITOR.toLocalizedString());
@@ -382,14 +416,12 @@ public class MemberMBeanBridge {
}
}
-
QueryDataFunction qDataFunction = new QueryDataFunction();
FunctionService.registerFunction(qDataFunction);
this.resourceManagerStats = cache.getInternalResourceManager().getStats();
}
-
public MemberMBeanBridge() {
this.monitor =
new MBeanStatsMonitor(ManagementStrings.MEMBER_CACHE_MONITOR.toLocalizedString());
@@ -407,7 +439,7 @@ public class MemberMBeanBridge {
}
public MemberMBeanBridge init() {
- CachePerfStats cachePerfStats = ((GemFireCacheImpl) cache).getCachePerfStats();
+ CachePerfStats cachePerfStats = this.cache.getCachePerfStats();
addCacheStats(cachePerfStats);
addFunctionStats(system.getFunctionServiceStats());
@@ -435,7 +467,7 @@ public class MemberMBeanBridge {
}
}
- MemoryAllocator allocator = ((GemFireCacheImpl) cache).getOffHeapStore();
+ MemoryAllocator allocator = this.cache.getOffHeapStore();
if ((null != allocator)) {
OffHeapMemoryStats offHeapStats = allocator.getStats();
@@ -541,7 +573,6 @@ public class MemberMBeanBridge {
removeDirectoryStats(dh.getDiskDirectoryStats());
}
}
-
}
public void removePartionRegionStats(PartitionedRegionStats parStats) {
@@ -556,14 +587,12 @@ public class MemberMBeanBridge {
regionMonitor.removeDirectoryStatistics(diskDirStats.getStats());
}
-
public void addLockServiceStats(DLockService lock) {
if (!lockStatsAdded) {
DLockStats stats = (DLockStats) lock.getStats();
addLockServiceStats(stats);
lockStatsAdded = true;
}
-
}
public void addLockServiceStats(DLockStats stats) {
@@ -573,7 +602,6 @@ public class MemberMBeanBridge {
public void addSystemStats() {
GemFireStatSampler sampler = system.getStatSampler();
-
ProcessStats processStats = sampler.getProcessStats();
StatSamplerStats samplerStats = sampler.getStatSamplerStats();
@@ -600,8 +628,6 @@ public class MemberMBeanBridge {
vmStatsMonitor.addStatisticsToMonitor(vmHeapStats);
}
- // vmStatsMonitor.addStatisticsToMonitor(vm50.getVMNonHeapStats());
-
StatisticsType gcType = VMStats50.getGCType();
if (gcType != null) {
Statistics[] gcStats = system.findStatisticsByType(gcType);
@@ -641,7 +667,6 @@ public class MemberMBeanBridge {
}
private void initializeStats() {
-
createsRate = new StatsRate(StatsKey.CREATES, StatType.INT_TYPE, monitor);
bytesReceivedRate = new StatsRate(StatsKey.RECEIVED_BYTES, StatType.LONG_TYPE, monitor);
bytesSentRate = new StatsRate(StatsKey.SENT_BYTES, StatType.LONG_TYPE, monitor);
@@ -684,7 +709,6 @@ public class MemberMBeanBridge {
netLoadsAverageLatency = new StatsAverageLatency(StatsKey.NET_LOADS_COMPLETED,
StatType.INT_TYPE, StatsKey.NET_LOADS_TIME, monitor);
-
netSearchAverageLatency = new StatsAverageLatency(StatsKey.NET_SEARCH_COMPLETED,
StatType.INT_TYPE, StatsKey.NET_SEARCH_TIME, monitor);
@@ -716,7 +740,6 @@ public class MemberMBeanBridge {
pdxDeserializationRate =
new StatsRate(StatsKey.PDX_INSTANCE_DESERIALIZATIONS, StatType.INT_TYPE, monitor);
-
lruDestroyRate = new StatsRate(StatsKey.LRU_DESTROYS, StatType.LONG_TYPE, regionMonitor);
lruEvictionRate = new StatsRate(StatsKey.LRU_EVICTIONS, StatType.LONG_TYPE, regionMonitor);
@@ -726,15 +749,12 @@ public class MemberMBeanBridge {
if (gemFirePropertyData == null) {
this.gemFirePropertyData = BeanUtilFuncs.initGemfireProperties(config);
}
-
}
-
/**
* @return Some basic JVM metrics at the particular instance
*/
public JVMMetrics fetchJVMMetrics() {
-
long gcCount = getGCStatistic(StatsKey.VM_GC_STATS_COLLECTIONS).longValue();
long gcTimeMillis = getGCStatistic(StatsKey.VM_GC_STATS_COLLECTION_TIME).longValue();
@@ -775,7 +795,6 @@ public class MemberMBeanBridge {
int availableProcessors = osBean.getAvailableProcessors();
double systemLoadAverage = osBean.getSystemLoadAverage();
-
openFileDescriptorCount = getVMStatistic(StatsKey.VM_STATS_OPEN_FDS).longValue();
processCpuTime = getVMStatistic(StatsKey.VM_PROCESS_CPU_TIME).longValue();
@@ -792,7 +811,6 @@ public class MemberMBeanBridge {
committedVirtualMemorySize = -1;
}
-
// If Linux System type exists
if (PureJavaMode.osStatsAreAvailable() && HostStatHelper.isLinux() && systemStat != null) {
@@ -835,14 +853,11 @@ public class MemberMBeanBridge {
if (logger.isTraceEnabled()) {
logger.trace(ex.getMessage(), ex);
}
-
}
return metrics;
-
}
/**
- *
* @return GemFire Properties
*/
public GemFireProperties getGemFireProperty() {
@@ -867,15 +882,12 @@ public class MemberMBeanBridge {
* @return a list of compacted Disk stores
*/
public String[] compactAllDiskStores() {
-
- GemFireCacheImpl cacheImpl = (GemFireCacheImpl) cache;
List<String> compactedStores = new ArrayList<String>();
if (cache != null && !cache.isClosed()) {
- for (DiskStore store : cacheImpl.listDiskStoresIncludingRegionOwned()) {
+ for (DiskStore store : this.cache.listDiskStoresIncludingRegionOwned()) {
if (store.forceCompaction()) {
compactedStores.add(((DiskStoreImpl) store).getPersistentID().getDirectory());
-
}
}
}
@@ -890,13 +902,12 @@ public class MemberMBeanBridge {
* @return list all the disk Stores name at cache level
*/
public String[] listDiskStores(boolean includeRegionOwned) {
- GemFireCacheImpl cacheImpl = (GemFireCacheImpl) cache;
String[] retStr = null;
Collection<DiskStore> diskCollection = null;
if (includeRegionOwned) {
- diskCollection = cacheImpl.listDiskStoresIncludingRegionOwned();
+ diskCollection = this.cache.listDiskStoresIncludingRegionOwned();
} else {
- diskCollection = cacheImpl.listDiskStores();
+ diskCollection = this.cache.listDiskStores();
}
if (diskCollection != null && diskCollection.size() > 0) {
retStr = new String[diskCollection.size()];
@@ -905,15 +916,12 @@ public class MemberMBeanBridge {
while (it.hasNext()) {
retStr[i] = it.next().getName();
i++;
-
}
}
return retStr;
-
}
/**
- *
* @return list of disk stores which defaults includeRegionOwned = true;
*/
public String[] getDiskStores() {
@@ -921,11 +929,9 @@ public class MemberMBeanBridge {
}
/**
- *
* @return log of the member.
*/
public String fetchLog(int numLines) {
-
if (numLines > ManagementConstants.MAX_SHOW_LOG_LINES) {
numLines = ManagementConstants.MAX_SHOW_LOG_LINES;
}
@@ -981,7 +987,6 @@ public class MemberMBeanBridge {
* before deciding to shut itself down
*/
public void shutDownMember() {
-
final InternalDistributedSystem ids = dm.getSystem();
if (ids.isConnected()) {
Thread t = new Thread(new Runnable() {
@@ -1000,22 +1005,17 @@ public class MemberMBeanBridge {
t.setDaemon(false);
t.start();
}
-
}
/**
* backs up all the disk to the targeted directory
*
* @param targetDirPath path of the directory where back up is to be taken
- * @return array of DiskBackup results which might get aggregated at Managing node
- *
- * Check the validity of this mbean call. When does it make sense to backup a single
- * member of a gemfire system in isolation of the other members?
+ * @return array of DiskBackup results which might get aggregated at Managing node Check the
+ * validity of this mbean call. When does it make sense to backup a single member of a
+ * gemfire system in isolation of the other members?
*/
public DiskBackupResult[] backupMember(String targetDirPath) {
-
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
-
if (cache != null) {
Collection<DiskStore> diskStores = cache.listDiskStoresIncludingRegionOwned();
for (DiskStore store : diskStores) {
@@ -1027,11 +1027,9 @@ public class MemberMBeanBridge {
File targetDir = new File(targetDirPath);
if (cache == null) {
-
return null;
} else {
-
try {
BackupManager manager =
cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
@@ -1064,7 +1062,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return The name for this member.
*/
public String getName() {
@@ -1072,7 +1069,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return The ID for this member.
*/
public String getId() {
@@ -1080,7 +1076,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return The name of the member if it's been set, otherwise the ID of the member
*/
public String getMember() {
@@ -1098,7 +1093,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return classPath of the VM
*/
public String getClassPath() {
@@ -1106,7 +1100,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return Connected gateway receivers
*/
public String[] listConnectedGatewayReceivers() {
@@ -1124,7 +1117,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return Connected gateway senders
*/
public String[] listConnectedGatewaySenders() {
@@ -1142,7 +1134,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return approximate usage of CPUs
*/
public float getCpuUsage() {
@@ -1150,7 +1141,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return current time of the system
*/
public long getCurrentTime() {
@@ -1171,19 +1161,15 @@ public class MemberMBeanBridge {
/**
* Gets a String describing the GemFire member's status. A GemFire member includes, but is not
* limited to: Locators, Managers, Cache Servers and so on.
- * </p>
- *
+ *
* @return String description of the GemFire member's status.
* @see #isLocator()
* @see #isServer()
*/
public String status() {
- // if (isLocator()) {
if (LocatorLauncher.getInstance() != null) {
return LocatorLauncher.getLocatorState().toJson();
- }
- // else if (isServer()) {
- else if (ServerLauncher.getInstance() != null) {
+ } else if (ServerLauncher.getInstance() != null) {
return ServerLauncher.getServerState().toJson();
}
@@ -1192,7 +1178,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return total heap usage in bytes
*/
public long getTotalBytesInUse() {
@@ -1201,7 +1186,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return Number of availabe CPUs
*/
public int getAvailableCpus() {
@@ -1210,7 +1194,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return JVM thread list
*/
public String[] fetchJvmThreads() {
@@ -1230,7 +1213,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return list of regions
*/
public String[] getListOfRegions() {
@@ -1248,7 +1230,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return configuration data lock lease
*/
public long getLockLease() {
@@ -1256,14 +1237,12 @@ public class MemberMBeanBridge {
}
/**
- *
* @return configuration data lock time out
*/
public long getLockTimeout() {
return cache.getLockTimeout();
}
-
/**
* @return the duration for which the member is up
*/
@@ -1296,7 +1275,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return true if this members has a gateway receiver
*/
public boolean hasGatewayReceiver() {
@@ -1304,7 +1282,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return true if member has Gateway senders
*/
public boolean hasGatewaySender() {
@@ -1312,7 +1289,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return true if member contains one locator. From 7.0 only locator can be hosted in a JVM
*/
public boolean isLocator() {
@@ -1320,12 +1296,10 @@ public class MemberMBeanBridge {
}
/**
- *
* @return true if the Federating Manager Thread is running
*/
public boolean isManager() {
- GemFireCacheImpl existingCache = GemFireCacheImpl.getInstance();
- if (existingCache == null || existingCache.isClosed()) {
+ if (this.cache == null || this.cache.isClosed()) {
return false;
}
try {
@@ -1342,8 +1316,7 @@ public class MemberMBeanBridge {
* @return true if the manager has been created.
*/
public boolean isManagerCreated() {
- GemFireCacheImpl existingCache = GemFireCacheImpl.getInstance();
- if (existingCache == null || existingCache.isClosed()) {
+ if (this.cache == null || this.cache.isClosed()) {
return false;
}
try {
@@ -1486,7 +1459,6 @@ public class MemberMBeanBridge {
public int getTotalHitCount() {
return getMemberLevelStatistic(StatsKey.GETS).intValue() - getTotalMissCount();
-
}
public float getLruDestroyRate() {
@@ -1552,7 +1524,6 @@ public class MemberMBeanBridge {
public int getTotalTransactionsCount() {
return getMemberLevelStatistic(StatsKey.TRANSACTION_COMMITS).intValue()
+ getMemberLevelStatistic(StatsKey.TRANSACTION_ROLLBACKS).intValue();
-
}
public long getTransactionCommitsAvgLatency() {
@@ -1650,7 +1621,6 @@ public class MemberMBeanBridge {
return regionMonitor.getDiskSpace();
}
-
public float getAverageReads() {
return instGetsRate;
}
@@ -1680,7 +1650,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return max limit of FD ..Ulimit
*/
public long getFileDescriptorLimit() {
@@ -1698,7 +1667,6 @@ public class MemberMBeanBridge {
}
/**
- *
* @return count of currently opened FDs
*/
public long getTotalFileDescriptorOpen() {
@@ -1806,7 +1774,6 @@ public class MemberMBeanBridge {
}
public int getHostCpuUsage() {
-
if (systemStat != null) {
return systemStat.get(StatsKey.SYSTEM_CPU_ACTIVE).intValue();
} else {
@@ -1814,12 +1781,10 @@ public class MemberMBeanBridge {
}
}
-
public boolean isCacheServer() {
return cacheServer;
}
-
public void setCacheServer(boolean cacheServer) {
this.cacheServer = cacheServer;
}
@@ -1832,22 +1797,18 @@ public class MemberMBeanBridge {
return resourceManagerStats.getRebalancesInProgress();
}
-
public int getReplyWaitsInProgress() {
return getMemberLevelStatistic(StatsKey.REPLY_WAITS_IN_PROGRESS).intValue();
}
-
public int getReplyWaitsCompleted() {
return getMemberLevelStatistic(StatsKey.REPLY_WAITS_COMPLETED).intValue();
}
-
public int getVisibleNodes() {
return getMemberLevelStatistic(StatsKey.NODES).intValue();
}
-
public long getMaxMemory() {
Runtime rt = Runtime.getRuntime();
return rt.maxMemory() / MBFactor;
[3/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
index b67b07d..8cfd4f2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/RegionMBeanBridge.java
@@ -45,8 +45,7 @@ import org.apache.geode.management.internal.beans.stats.StatsRate;
/**
* This class acts as a bridge between a Region and RegionMBean This also listens for statistics
* changes and update its value accordingly
- *
- *
+ *
* @param <K>
* @param <V>
*/
@@ -100,10 +99,7 @@ public class RegionMBeanBridge<K, V> {
private StatsRate averageReadsRate;
-
-
public static <K, V> RegionMBeanBridge<K, V> getInstance(Region<K, V> region) {
-
if (region.getAttributes().getPartitionAttributes() != null) {
RegionMBeanBridge<K, V> bridge = PartitionedRegionBridge.getInstance(region);
PartitionedRegion parRegion = ((PartitionedRegion) region);
@@ -119,9 +115,7 @@ public class RegionMBeanBridge<K, V> {
}
bridge.addDiskRegionBridge(diskRegionBridge);
-
}
-
return bridge;
} else {
@@ -139,11 +133,9 @@ public class RegionMBeanBridge<K, V> {
}
}
return bridge;
-
}
}
-
protected void addDiskRegionBridge(DiskRegionBridge diskRegionBridge) {
this.diskRegionBridge = diskRegionBridge;
}
@@ -167,8 +159,6 @@ public class RegionMBeanBridge<K, V> {
this.persistentEnabled = region.getAttributes().getDataPolicy().withPersistence();
-
-
this.regionStats = ((LocalRegion) region).getRegionPerfStats();
if (regionStats != null) {
regionMonitor.addStatisticsToMonitor(regionStats.getStats()); // fixes 46692
@@ -183,7 +173,6 @@ public class RegionMBeanBridge<K, V> {
if (ea != null && ea.getAlgorithm().isLRUMemory()) {
this.lruMemoryStats = stats;
}
-
}
}
@@ -194,8 +183,6 @@ public class RegionMBeanBridge<K, V> {
this.member = GemFireCacheImpl.getInstance().getDistributedSystem().getMemberId();
}
-
-
public String getRegionType() {
return region.getAttributes().getDataPolicy().toString();
}
@@ -216,7 +203,6 @@ public class RegionMBeanBridge<K, V> {
return membershipAttributesData;
}
-
public RegionAttributesData listRegionAttributes() {
return regionAttributesData;
}
@@ -238,11 +224,6 @@ public class RegionMBeanBridge<K, V> {
return subregionPaths.toArray(new String[subregionPaths.size()]);
}
- /** Statistic related Methods **/
-
-
-
- // Dummy constructor for testing purpose only
public RegionMBeanBridge(CachePerfStats cachePerfStats) {
this.regionStats = cachePerfStats;
@@ -255,8 +236,6 @@ public class RegionMBeanBridge<K, V> {
// Dummy constructor for testing purpose only
public RegionMBeanBridge() {}
-
-
public void stopMonitor() {
regionMonitor.stopListener();
if (diskRegionBridge != null) {
@@ -264,9 +243,7 @@ public class RegionMBeanBridge<K, V> {
}
}
-
private void configureRegionMetrics() {
-
putAllRate = new StatsRate(StatsKey.PUT_ALLS, StatType.INT_TYPE, regionMonitor);
getRequestRate = new StatsRate(StatsKey.GETS, StatType.INT_TYPE, regionMonitor);
@@ -282,7 +259,6 @@ public class RegionMBeanBridge<K, V> {
writerCallsAvgLatency = new StatsAverageLatency(StatsKey.CACHE_WRITER_CALLS_COMPLETED,
StatType.INT_TYPE, StatsKey.CACHE_WRITER_CALL_TIME, regionMonitor);
-
lruDestroyRate = new StatsRate(StatsKey.LRU_DESTROYS, StatType.LONG_TYPE, regionMonitor);
lruEvictionRate = new StatsRate(StatsKey.LRU_EVICTIONS, StatType.LONG_TYPE, regionMonitor);
@@ -290,7 +266,6 @@ public class RegionMBeanBridge<K, V> {
String[] writesRates = new String[] {StatsKey.PUT_ALLS, StatsKey.PUTS, StatsKey.CREATES};
averageWritesRate = new StatsRate(writesRates, StatType.INT_TYPE, regionMonitor);
averageReadsRate = new StatsRate(StatsKey.GETS, StatType.INT_TYPE, regionMonitor);
-
}
private Number getRegionStatistic(String statName) {
@@ -321,7 +296,6 @@ public class RegionMBeanBridge<K, V> {
return putAllRate.getRate();
}
-
public float getPutsRate() {
return putRequestRate.getRate();
}
@@ -339,7 +313,6 @@ public class RegionMBeanBridge<K, V> {
return region.getStatistics().getHitCount();
}
return ManagementConstants.NOT_AVAILABLE_LONG;
-
}
public float getHitRatio() {
@@ -370,7 +343,6 @@ public class RegionMBeanBridge<K, V> {
return ManagementConstants.NOT_AVAILABLE_LONG;
}
-
public float getLruDestroyRate() {
return lruDestroyRate.getRate();
}
@@ -394,7 +366,6 @@ public class RegionMBeanBridge<K, V> {
return ManagementConstants.NOT_AVAILABLE_LONG;
}
-
public boolean isGatewayEnabled() {
return isGatewayEnabled;
}
@@ -407,7 +378,6 @@ public class RegionMBeanBridge<K, V> {
return member;
}
-
/**
* Only applicable for PRs
*
@@ -520,7 +490,6 @@ public class RegionMBeanBridge<K, V> {
return null;
}
-
public long getDiskReadsAverageLatency() {
if (this.diskRegionBridge != null) {
return diskRegionBridge.getDiskReadsAverageLatency();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 d125e53..bd6d810 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,30 +14,6 @@
*/
package org.apache.geode.management.internal.cli;
-import org.apache.geode.cache.Cache;
-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.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;
-
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileFilter;
@@ -66,15 +42,40 @@ 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).
*
- *
* @since GemFire 7.0
*/
public class CliUtil {
+
public static final String GFSHVM_IDENTIFIER = "gfsh";
+
public static boolean isGfshVM = Boolean.getBoolean(GFSHVM_IDENTIFIER);
public static final FileFilter JAR_FILE_FILTER = new CustomFileFilter(".jar");
@@ -123,10 +124,10 @@ public class CliUtil {
return null;
}
- public static Cache getCacheIfExists() {
- Cache cache;
+ public static InternalCache getCacheIfExists() {
+ InternalCache cache;
try {
- cache = CacheFactory.getAnyInstance();
+ cache = getInternalCache();
} catch (CacheClosedException e) {
// ignore & return null
cache = null;
@@ -146,8 +147,8 @@ public class CliUtil {
throw new FileNotFoundException("Could not find " + file.getCanonicalPath());
}
- if (file.isDirectory()) { // TODO - Abhishek: (1) No recursive search yet. (2) Do we need to
- // check/limit size of the files too?
+ if (file.isDirectory()) {
+ // TODO: (1) No recursive search yet. (2) Do we need to check/limit size of the files too?
File[] childrenFiles = file.listFiles(JAR_FILE_FILTER);
for (int j = 0; j < childrenFiles.length; j++) {
// 1. add name of the file as bytes at even index
@@ -221,15 +222,17 @@ public class CliUtil {
}
}
-
-
public static boolean isValidFileName(String filePath, String extension) {
boolean isValid = true;
return isValid;
}
+ private static InternalCache getInternalCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
public static Set<String> getAllRegionNames() {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getInternalCache();
Set<String> regionNames = new HashSet<String>();
Set<Region<?, ?>> rootRegions = cache.rootRegions();
@@ -278,8 +281,6 @@ public class CliUtil {
return sb.toString();
}
-
-
public static Set<DistributedMember> findMembersOrThrow(final String groups, final String members)
throws CommandResultException {
@@ -307,7 +308,7 @@ public class CliUtil {
*/
public static Set<DistributedMember> findMembersIncludingLocators(String[] groups,
String[] members) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getInternalCache();
Set<DistributedMember> allMembers = getAllMembers(cache);
return findMembers(allMembers, groups, members);
@@ -318,7 +319,7 @@ public class CliUtil {
* locators.
*/
public static Set<DistributedMember> findMembers(String[] groups, String[] members) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getInternalCache();
Set<DistributedMember> allNormalMembers = getAllNormalMembers(cache);
return findMembers(allNormalMembers, groups, members);
@@ -367,7 +368,7 @@ public class CliUtil {
DistributedMember memberFound = null;
if (memberNameOrId != null) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getInternalCache();
Set<DistributedMember> memberSet = CliUtil.getAllMembers(cache);
for (DistributedMember member : memberSet) {
if (memberNameOrId.equalsIgnoreCase(member.getId())
@@ -442,7 +443,6 @@ public class CliUtil {
@Override
public boolean accept(File pathname) {
String name = pathname.getName();
-
return name.endsWith(extensionWithDot);
}
}
@@ -493,10 +493,6 @@ public class CliUtil {
private final int dataLength;
private final byte[] data;
- /**
- * @param dataLength
- * @param data
- */
public DeflaterInflaterData(int dataLength, byte[] data) {
this.dataLength = dataLength;
this.data = data;
@@ -565,20 +561,24 @@ public class CliUtil {
/**
* Returns a set of all the members of the distributed system excluding locators.
+ *
+ * @param cache
*/
@SuppressWarnings("unchecked")
- public static Set<DistributedMember> getAllNormalMembers(Cache cache) {
- return new HashSet<DistributedMember>(((InternalDistributedSystem) cache.getDistributedSystem())
+ public static Set<DistributedMember> getAllNormalMembers(InternalCache cache) {
+ return new HashSet<DistributedMember>(cache.getInternalDistributedSystem()
.getDistributionManager().getNormalDistributionManagerIds());
}
/**
* Returns a set of all the members of the distributed system including locators.
+ *
+ * @param cache
*/
@SuppressWarnings("unchecked")
- public static Set<DistributedMember> getAllMembers(Cache cache) {
- return new HashSet<DistributedMember>(((InternalDistributedSystem) cache.getDistributedSystem())
- .getDistributionManager().getDistributionManagerIds());
+ public static Set<DistributedMember> getAllMembers(InternalCache cache) {
+ return new HashSet<DistributedMember>(
+ cache.getInternalDistributedSystem().getDistributionManager().getDistributionManagerIds());
}
@SuppressWarnings("unchecked")
@@ -590,11 +590,12 @@ public class CliUtil {
/**
* Returns a set of all the members of the distributed system for the given groups.
*/
- public static Set<DistributedMember> getDistributedMembersByGroup(Cache cache, String[] groups) {
+ public static Set<DistributedMember> getDistributedMembersByGroup(InternalCache cache,
+ String[] groups) {
Set<DistributedMember> groupMembers = new HashSet<DistributedMember>();
for (String group : groups) {
- groupMembers.addAll(((InternalDistributedSystem) cache.getDistributedSystem())
- .getDistributionManager().getGroupMembers(group));
+ groupMembers.addAll(
+ cache.getInternalDistributedSystem().getDistributionManager().getGroupMembers(group));
}
return groupMembers;
}
@@ -652,13 +653,13 @@ public class CliUtil {
* find.
*
* @param region region path for which members that have this region are required
- * @param cache Cache instance to use to find members
+ * @param cache cache instance to use to find members
* @param returnAll whether to return all members or only the first member we find. Returns all
* when <code>true</code>
* @return a Set of DistributedMember for members that have the specified <code>region</code>.
*/
public static Set<DistributedMember> getRegionAssociatedMembers(final String region,
- final Cache cache, boolean returnAll) {
+ final InternalCache cache, boolean returnAll) {
if (region == null || region.isEmpty()) {
return null;
}
@@ -742,20 +743,16 @@ public class CliUtil {
/**
* Resolves file system path relative to Gfsh. If the pathname is not specified, then pathname is
* returned.
- * <p/>
*
* @param pathname a String value specifying the file system pathname to resolve.
* @return a String specifying a path relative to Gfsh.
*/
- // Moved form LauncherLifeCycleCommands
public static String resolvePathname(final String pathname) {
return (StringUtils.isBlank(pathname) ? pathname
: IOUtils.tryGetCanonicalPathElseGetAbsolutePath(new File(pathname)));
}
-
public static void runLessCommandAsExternalViewer(Result commandResult, boolean isError) {
-
StringBuilder sb = new StringBuilder();
String NEW_LINE = System.getProperty("line.separator");
@@ -784,7 +781,6 @@ public class CliUtil {
if (file != null)
file.delete();
}
-
}
public static String getClientIdFromCacheClientProxy(CacheClientProxy p) {
@@ -797,7 +793,7 @@ public class CliUtil {
return buffer.toString();
}
- public static Set<DistributedMember> getMembersForeRegionViaFunction(Cache cache,
+ public static Set<DistributedMember> getMembersForeRegionViaFunction(InternalCache cache,
String regionPath, boolean returnAll) {
try {
Set<DistributedMember> regionMembers = new HashSet<DistributedMember>();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 f077180..ae44e24 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
@@ -12,10 +12,15 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.cache.Cache;
+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.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
@@ -23,6 +28,7 @@ import org.apache.geode.cache.execute.FunctionService;
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;
@@ -30,12 +36,6 @@ 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
@@ -126,8 +126,8 @@ public abstract class AbstractCommandsSupport implements CommandMarker {
return (getGfsh() != null);
}
- protected Cache getCache() {
- return CacheFactory.getAnyInstance();
+ protected InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
}
protected static Gfsh getGfsh() {
@@ -135,7 +135,7 @@ public abstract class AbstractCommandsSupport implements CommandMarker {
}
@SuppressWarnings("deprecated")
- protected DistributedMember getMember(final Cache cache, final String memberName) {
+ protected DistributedMember getMember(final InternalCache cache, final String memberName) {
for (final DistributedMember member : getMembers(cache)) {
if (memberName.equalsIgnoreCase(member.getName())
|| memberName.equalsIgnoreCase(member.getId())) {
@@ -149,15 +149,14 @@ public abstract class AbstractCommandsSupport implements CommandMarker {
/**
* Gets all members in the GemFire distributed system/cache.
- * </p>
- *
+ *
* @param cache the GemFire cache.
* @return all members in the GemFire distributed system/cache.
- * @see org.apache.geode.management.internal.cli.CliUtil#getAllMembers(org.apache.geode.cache.Cache)
+ * @see org.apache.geode.management.internal.cli.CliUtil#getAllMembers(org.apache.geode.internal.cache.InternalCache)
* @deprecated use CliUtil.getAllMembers(org.apache.geode.cache.Cache) instead
*/
@Deprecated
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
Set<DistributedMember> members = new HashSet<DistributedMember>(cache.getMembers());
members.add(cache.getDistributedSystem().getDistributedMember());
return members;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 c4455ad..3b1fb09 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,9 +14,29 @@
*/
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.geode.LogWriter;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.PartitionResolver;
@@ -30,7 +50,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+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;
@@ -63,31 +83,12 @@ 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>();
@@ -108,6 +109,9 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
PERSISTENT_OVERFLOW_SHORTCUTS.add(RegionShortcut.LOCAL_PERSISTENT_OVERFLOW);
}
+ /**
+ * TODO: method createRegion is too complex to analyze
+ */
@CliCommand(value = CliStrings.CREATE_REGION, help = CliStrings.CREATE_REGION__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
@@ -229,7 +233,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (regionShortcut != null && useAttributesFrom != null) {
throw new IllegalArgumentException(
@@ -285,7 +289,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
String cacheLoaderClass =
cacheLoader != null ? cacheLoader : regionAttributesResult.getCacheLoaderClass();
String cacheWriterClass =
- cacheWriter != null ? cacheWriter : regionAttributesResult.getCacheWriterClass();;
+ cacheWriter != null ? cacheWriter : regionAttributesResult.getCacheWriterClass();
regionFunctionArgs = new RegionFunctionArgs(regionPath, useAttributesFrom, skipIfExists,
keyConstraint, valueConstraint, statisticsEnabled, entryIdle, entryTTL, regionIdle,
@@ -375,7 +379,6 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
} catch (RuntimeException e) {
LogWrapper.getInstance().info(e.getMessage(), e);
result = ResultBuilder.createGemFireErrorResult(e.getMessage());
-
}
if (xmlEntity.get() != null) {
persistClusterConfiguration(result,
@@ -385,11 +388,9 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return result;
}
-
- public boolean verifyDistributedRegionMbean(Cache cache, String regionName) {
- GemFireCacheImpl gemfireCache = (GemFireCacheImpl) cache;
+ public boolean verifyDistributedRegionMbean(InternalCache cache, String regionName) {
int federationInterval =
- gemfireCache.getInternalDistributedSystem().getConfig().getJmxManagerUpdateRate();
+ cache.getInternalDistributedSystem().getConfig().getJmxManagerUpdateRate();
long timeEnd = System.currentTimeMillis() + federationInterval + 50;
for (; System.currentTimeMillis() <= timeEnd;) {
@@ -479,7 +480,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
this.securityService.authorizeRegionManage(regionPath);
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (groups != null) {
validateGroups(cache, groups);
@@ -616,7 +617,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return result;
}
- private static boolean regionExists(Cache cache, String regionPath) {
+ private static boolean regionExists(InternalCache cache, String regionPath) {
boolean regionFound = false;
if (regionPath != null && !Region.SEPARATOR.equals(regionPath)) {
ManagementService managementService = ManagementService.getExistingManagementService(cache);
@@ -633,7 +634,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return regionFound;
}
- private void validateRegionPathAndParent(Cache cache, String regionPath) {
+ private void validateRegionPathAndParent(InternalCache cache, String regionPath) {
if (regionPath == null || "".equals(regionPath)) {
throw new IllegalArgumentException(CliStrings.CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH);
}
@@ -649,8 +650,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
}
-
- private void validateGroups(Cache cache, String[] groups) {
+ private void validateGroups(InternalCache cache, String[] groups) {
if (groups != null && groups.length != 0) {
Set<String> existingGroups = new HashSet<String>();
Set<DistributedMember> members = CliUtil.getAllNormalMembers(cache);
@@ -669,7 +669,8 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
}
- private void validateRegionFunctionArgs(Cache cache, RegionFunctionArgs regionFunctionArgs) {
+ private void validateRegionFunctionArgs(InternalCache cache,
+ RegionFunctionArgs regionFunctionArgs) {
if (regionFunctionArgs.getRegionPath() == null) {
throw new IllegalArgumentException(CliStrings.CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH);
}
@@ -751,16 +752,6 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
new Object[] {prRedundantCopies}));
}
}
- // Validation for the following is not known yet
- // if (partitionArgs.isSetPRTotalNumBuckets()) {
- // int prTotalNumBuckets = partitionArgs.getPrTotalNumBuckets();
- // }
- // if (partitionArgs.isSetPRStartupRecoveryDelay()) {
- // long prStartupRecoveryDelay = partitionArgs.getPrStartupRecoveryDelay();
- // }
- // if (partitionArgs.isSetPRRecoveryDelay()) {
- // long prRecoveryDelay = partitionArgs.getPrRecoveryDelay();
- // }
}
String keyConstraint = regionFunctionArgs.getKeyConstraint();
@@ -918,7 +909,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
}
}
- private boolean diskStoreExists(Cache cache, String diskStoreName) {
+ private boolean diskStoreExists(InternalCache cache, String diskStoreName) {
ManagementService managementService = ManagementService.getExistingManagementService(cache);
DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean();
Map<String, String[]> diskstore = dsMXBean.listMemberDiskstore();
@@ -935,9 +926,9 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return false;
}
- private static <K, V> FetchRegionAttributesFunctionResult<K, V> getRegionAttributes(Cache cache,
- String regionPath) {
- if (!isClusterwideSameConfig(cache, regionPath)) {
+ private static <K, V> FetchRegionAttributesFunctionResult<K, V> getRegionAttributes(
+ InternalCache cache, String regionPath) {
+ if (!isClusterWideSameConfig(cache, regionPath)) {
throw new IllegalStateException(CliStrings.format(
CliStrings.CREATE_REGION__MSG__USE_ATTRIBUTES_FORM_REGIONS_EXISTS_BUT_DIFFERENT_SCOPE_OR_DATAPOLICY_USE_DESCRIBE_REGION_FOR_0,
regionPath));
@@ -990,7 +981,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return attributes;
}
- private static boolean isClusterwideSameConfig(Cache cache, String regionPath) {
+ private static boolean isClusterWideSameConfig(InternalCache cache, String regionPath) {
ManagementService managementService = ManagementService.getExistingManagementService(cache);
DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean();
@@ -1053,7 +1044,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
AtomicReference<XmlEntity> xmlEntity = new AtomicReference<>();
try {
String message = "";
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
ManagementService managementService = ManagementService.getExistingManagementService(cache);
String regionPathToUse = regionPath;
@@ -1076,7 +1067,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
CliUtil.executeFunction(RegionDestroyFunction.INSTANCE, regionPath, regionMembersList);
List<CliFunctionResult> resultsList = (List<CliFunctionResult>) resultCollector.getResult();
message = CliStrings.format(CliStrings.DESTROY_REGION__MSG__REGION_0_1_DESTROYED,
- new Object[] {regionPath, /* subRegionMessage */""});
+ new Object[] {regionPath, ""});
// Only if there is an error is this set to false
boolean isRegionDestroyed = true;
@@ -1121,7 +1112,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return result;
}
- private Set<DistributedMember> findMembersForRegion(Cache cache,
+ private Set<DistributedMember> findMembersForRegion(InternalCache cache,
ManagementService managementService, String regionPath) {
Set<DistributedMember> membersList = new HashSet<>();
Set<String> regionMemberIds = new HashSet<>();
@@ -1181,7 +1172,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
return membersList;
}
- private Set<DistributedMember> getMembersByIds(Cache cache, Set<String> memberIds) {
+ private Set<DistributedMember> getMembersByIds(InternalCache cache, Set<String> memberIds) {
Set<DistributedMember> foundMembers = Collections.emptySet();
if (memberIds != null && !memberIds.isEmpty()) {
foundMembers = new HashSet<DistributedMember>();
@@ -1203,7 +1194,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
CliStrings.DESTROY_REGION})
public boolean isRegionCommandAvailable() {
boolean isAvailable = true; // always available on server
- if (CliUtil.isGfshVM()) { // in gfsh check if connected //TODO - Abhishek: make this better
+ if (CliUtil.isGfshVM()) { // in gfsh check if connected //TODO: make this better
isAvailable = getGfsh() != null && getGfsh().isConnectedAndReady();
}
return isAvailable;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 29d68bd..46ee2b0 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,8 +14,28 @@
*/
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.geode.LogWriter;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -30,7 +50,7 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.partition.PartitionRebalanceInfo;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.security.IntegratedSecurityService;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.DistributedRegionMXBean;
@@ -59,35 +79,16 @@ 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.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;
/**
- *
* @since GemFire 7.0
*/
public class DataCommands implements CommandMarker {
final int resultItemCount = 9;
+
private final ExportDataFunction exportDataFunction = new ExportDataFunction();
+
private final ImportDataFunction importDataFunction = new ImportDataFunction();
private SecurityService securityService = IntegratedSecurityService.getSecurityService();
@@ -96,6 +97,10 @@ public class DataCommands implements CommandMarker {
return Gfsh.getCurrentInstance();
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@CliCommand(value = CliStrings.REBALANCE, help = CliStrings.REBALANCE__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
@@ -135,15 +140,13 @@ public class DataCommands implements CommandMarker {
}
LogWrapper.getInstance().info("Rebalance returning result >>>" + result);
return result;
-
-
}
private class ExecuteRebalanceWithTimeout implements Callable<Result> {
String[] includeRegions = null;
String[] excludeRegions = null;
boolean simulate;
- Cache cache = CacheFactory.getAnyInstance();;
+ InternalCache cache = getCache();
@Override
public Result call() throws Exception {
@@ -163,8 +166,6 @@ public class DataCommands implements CommandMarker {
Result result = null;
try {
RebalanceOperation op = null;
- new HashSet<String>();
- new HashSet<String>();
if (includeRegions != null && includeRegions.length > 0) {
CompositeResultData rebalanceResulteData = ResultBuilder.createCompositeResultData();
@@ -253,7 +254,6 @@ public class DataCommands implements CommandMarker {
result = ResultBuilder.buildResult(toCompositeResultData(rebalanceResulteData,
(ArrayList) rstList, index, simulate, cache));
-
}
} else {
@@ -279,12 +279,11 @@ public class DataCommands implements CommandMarker {
// Wait until the rebalance is complete and then get the results
result = ResultBuilder.buildResult(buildResultForRebalance(rebalanceResulteData,
op.getResults(), index, simulate, cache));
-
}
}
index++;
}
- LogWrapper.getInstance().info("Rebalance returning result" + result);
+ LogWrapper.getInstance().info("Rebalance returning result " + result);
return result;
} else {
result = executeRebalanceOnDS(cache, String.valueOf(simulate), excludeRegions);
@@ -307,7 +306,6 @@ public class DataCommands implements CommandMarker {
}
return rstList;
-
}
boolean checkResultList(CompositeResultData rebalanceResulteData, List resultList,
@@ -349,10 +347,9 @@ public class DataCommands implements CommandMarker {
}
return toContinueForOtherMembers;
-
}
- Result executeRebalanceOnDS(Cache cache, String simulate, String[] excludeRegionsList) {
+ Result executeRebalanceOnDS(InternalCache cache, String simulate, String[] excludeRegionsList) {
Result result = null;
int index = 1;
CompositeResultData rebalanceResulteData = ResultBuilder.createCompositeResultData();
@@ -369,7 +366,6 @@ public class DataCommands implements CommandMarker {
.createInfoResult(CliStrings.REBALANCE__MSG__NO_REBALANCING_REGIONS_ON_DS);
}
-
Iterator<MemberPRInfo> iterator = listMemberRegion.iterator();
boolean flagToContinueWithRebalance = false;
@@ -471,7 +467,7 @@ public class DataCommands implements CommandMarker {
return result;
}
- public boolean checkMemberPresence(DistributedMember dsMember, Cache cache) {
+ public boolean checkMemberPresence(DistributedMember dsMember, InternalCache cache) {
// check if member's presence just before executing function
// this is to avoid running a function on departed members #47248
Set<DistributedMember> dsMemberList = CliUtil.getAllNormalMembers(cache);
@@ -488,7 +484,7 @@ public class DataCommands implements CommandMarker {
}
protected CompositeResultData toCompositeResultData(CompositeResultData rebalanceResulteData,
- ArrayList<String> rstlist, int index, boolean simulate, Cache cache) {
+ 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
@@ -565,7 +561,7 @@ public class DataCommands implements CommandMarker {
}
CompositeResultData buildResultForRebalance(CompositeResultData rebalanceResulteData,
- RebalanceResults results, int index, boolean simulate, Cache cache) {
+ RebalanceResults results, int index, boolean simulate, InternalCache cache) {
Set<PartitionRebalanceInfo> regions = results.getPartitionRebalanceDetails();
Iterator iterator = regions.iterator();
@@ -655,13 +651,11 @@ public class DataCommands implements CommandMarker {
cache.getLogger().info(headerText + resultStr);
}
return rebalanceResulteData;
-
}
- public DistributedMember getAssociatedMembers(String region, final Cache cache) {
-
- DistributedRegionMXBean bean = ManagementService
- .getManagementService(GemFireCacheImpl.getInstance()).getDistributedRegionMXBean(region);
+ public DistributedMember getAssociatedMembers(String region, final InternalCache cache) {
+ DistributedRegionMXBean bean =
+ ManagementService.getManagementService(cache).getDistributedRegionMXBean(region);
DistributedMember member = null;
@@ -688,10 +682,9 @@ public class DataCommands implements CommandMarker {
}
}
return member;
-
}
- List<MemberPRInfo> getMemberRegionList(Cache cache, List<String> listExcludedRegion) {
+ List<MemberPRInfo> getMemberRegionList(InternalCache cache, List<String> listExcludedRegion) {
List<MemberPRInfo> listMemberPRInfo = new ArrayList<MemberPRInfo>();
String[] listDSRegions =
ManagementService.getManagementService(cache).getDistributedSystemMXBean().listRegions();
@@ -729,15 +722,12 @@ public class DataCommands implements CommandMarker {
if (!regionName.startsWith("/")) {
regionName = Region.SEPARATOR + regionName;
-
}
- // remove this prefix / once Rishi fixes this
+ // remove this prefix /
DistributedRegionMXBean bean =
- ManagementService.getManagementService(GemFireCacheImpl.getInstance())
- .getDistributedRegionMXBean(regionName);
+ ManagementService.getManagementService(cache).getDistributedRegionMXBean(regionName);
if (bean != null) {
- // TODO: Ajay to call a method once Rishi provides
if (bean.getRegionType().equals(DataPolicy.PARTITION.toString())
|| bean.getRegionType().equals(DataPolicy.PERSISTENT_PARTITION.toString())) {
@@ -755,13 +745,11 @@ public class DataCommands implements CommandMarker {
listMember.dsMemberList.add(dsmember);
} else {
listMemberPRInfo.add(memberAndItsPRRegions);
-
}
break;
}
}
}
-
}
}
}
@@ -769,8 +757,6 @@ public class DataCommands implements CommandMarker {
return listMemberPRInfo;
}
-
-
@CliCommand(value = CliStrings.EXPORT_DATA, help = CliStrings.EXPORT_DATA__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION})
public Result exportData(
@@ -786,7 +772,6 @@ public class DataCommands implements CommandMarker {
help = CliStrings.EXPORT_DATA__MEMBER__HELP) String memberNameOrId) {
this.securityService.authorizeRegionRead(regionName);
- final Cache cache = CacheFactory.getAnyInstance();
final DistributedMember targetMember = CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
Result result = null;
@@ -850,7 +835,6 @@ public class DataCommands implements CommandMarker {
Result result = null;
try {
- final Cache cache = CacheFactory.getAnyInstance();
final DistributedMember targetMember = CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
if (!filePath.endsWith(CliStrings.GEODE_DATA_FILE_EXTENSION)) {
@@ -909,7 +893,7 @@ public class DataCommands implements CommandMarker {
unspecifiedDefaultValue = "false") boolean putIfAbsent) {
this.securityService.authorizeRegionWrite(regionPath);
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DataCommandResult dataResult = null;
if (regionPath == null || regionPath.isEmpty()) {
return makePresentationResult(DataCommandResult.createPutResult(key, null, null,
@@ -928,8 +912,7 @@ public class DataCommands implements CommandMarker {
Region region = cache.getRegion(regionPath);
DataCommandFunction putfn = new DataCommandFunction();
if (region == null) {
- Set<DistributedMember> memberList =
- getRegionAssociatedMembers(regionPath, CacheFactory.getAnyInstance(), false);
+ Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
if (memberList != null && memberList.size() > 0) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.PUT);
@@ -978,7 +961,7 @@ public class DataCommands implements CommandMarker {
help = CliStrings.GET__LOAD__HELP) Boolean loadOnCacheMiss) {
this.securityService.authorizeRegionRead(regionPath, key);
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DataCommandResult dataResult = null;
if (regionPath == null || regionPath.isEmpty()) {
@@ -994,8 +977,7 @@ public class DataCommands implements CommandMarker {
Region region = cache.getRegion(regionPath);
DataCommandFunction getfn = new DataCommandFunction();
if (region == null) {
- Set<DistributedMember> memberList =
- getRegionAssociatedMembers(regionPath, CacheFactory.getAnyInstance(), false);
+ Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
if (memberList != null && memberList.size() > 0) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.GET);
@@ -1054,8 +1036,7 @@ public class DataCommands implements CommandMarker {
null, null, CliStrings.LOCATE_ENTRY__MSG__KEY_EMPTY, false));
DataCommandFunction locateEntry = new DataCommandFunction();
- Set<DistributedMember> memberList =
- getRegionAssociatedMembers(regionPath, CacheFactory.getAnyInstance(), true);
+ Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), true);
if (memberList != null && memberList.size() > 0) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.LOCATE_ENTRY);
@@ -1088,7 +1069,7 @@ public class DataCommands implements CommandMarker {
specifiedDefaultValue = "true", unspecifiedDefaultValue = "false") boolean removeAllKeys,
@CliOption(key = {CliStrings.REMOVE__KEYCLASS},
help = CliStrings.REMOVE__KEYCLASS__HELP) String keyClass) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DataCommandResult dataResult = null;
if (regionPath == null || regionPath.isEmpty()) {
@@ -1111,8 +1092,7 @@ public class DataCommands implements CommandMarker {
Region region = cache.getRegion(regionPath);
DataCommandFunction removefn = new DataCommandFunction();
if (region == null) {
- Set<DistributedMember> memberList =
- getRegionAssociatedMembers(regionPath, CacheFactory.getAnyInstance(), false);
+ Set<DistributedMember> memberList = getRegionAssociatedMembers(regionPath, getCache(), false);
if (memberList != null && memberList.size() > 0) {
DataCommandRequest request = new DataCommandRequest();
request.setCommand(CliStrings.REMOVE);
@@ -1188,7 +1168,6 @@ public class DataCommands implements CommandMarker {
return true;
}
return false;
-
}
}
@@ -1236,11 +1215,10 @@ public class DataCommands implements CommandMarker {
}
return result;
}
-
}
public static Set<DistributedMember> getQueryRegionsAssociatedMembers(Set<String> regions,
- final Cache cache, boolean returnAll) {
+ final InternalCache cache, boolean returnAll) {
LogWriter logger = cache.getLogger();
Set<DistributedMember> members = null;
Set<DistributedMember> newMembers = null;
@@ -1286,8 +1264,8 @@ public class DataCommands implements CommandMarker {
}
@SuppressWarnings("rawtypes")
- public static Set<DistributedMember> getRegionAssociatedMembers(String region, final Cache cache,
- boolean returnAll) {
+ public static Set<DistributedMember> getRegionAssociatedMembers(String region,
+ final InternalCache cache, boolean returnAll) {
DistributedMember member = null;
@@ -1336,7 +1314,7 @@ public class DataCommands implements CommandMarker {
return matchedMembers;
}
- // TODO - Abhishek revisit after adding support in Gfsh.java?
+ // TODO:k revisit after adding support in Gfsh.java?
public static Object[] replaceGfshEnvVar(String query, Map<String, String> gfshEnvVarMap) {
boolean done = false;
int startIndex = 0;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
index a96d3c2..bea7e77 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java
@@ -14,13 +14,35 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+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.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.GemFireIOException;
import org.apache.geode.SystemFailure;
import org.apache.geode.admin.BackupStatus;
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheExistsException;
-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.FunctionInvocationTargetException;
@@ -32,7 +54,7 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DiskStoreAttributes;
import org.apache.geode.internal.cache.DiskStoreImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.cache.partitioned.ColocatedRegionDetails;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
@@ -73,35 +95,10 @@ import org.apache.geode.management.internal.messages.CompactRequest;
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.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
/**
* The DiskStoreCommands class encapsulates all GemFire Disk Store commands in Gfsh.
- * </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
* @since GemFire 7.0
*/
@@ -109,12 +106,12 @@ import java.util.concurrent.atomic.AtomicReference;
public class DiskStoreCommands extends AbstractCommandsSupport {
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
// TODO determine what this does (as it is untested and unmockable!)
return CliUtil.getAllMembers(cache);
}
- protected Set<DistributedMember> getNormalMembers(final Cache cache) {
+ protected Set<DistributedMember> getNormalMembers(final InternalCache cache) {
// TODO determine what this does (as it is untested and unmockable!)
return CliUtil.getAllNormalMembers(cache);
}
@@ -132,7 +129,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
Result result = null;
try {
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DM dm = cache.getDistributionManager();
BackupStatus backupStatus = null;
@@ -149,9 +146,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
Set<DistributedMember> backedupMembers = backedupMemberDiskstoreMap.keySet();
CompositeResultData crd = ResultBuilder.createCompositeResultData();
-
if (!backedupMembers.isEmpty()) {
-
SectionResultData backedupDiskStoresSection = crd.addSection();
backedupDiskStoresSection.setHeader(CliStrings.BACKUP_DISK_STORE_MSG_BACKED_UP_DISK_STORES);
TabularResultData backedupDiskStoresTable = backedupDiskStoresSection.addTable();
@@ -218,7 +213,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
backedupDiskStoreTable.accumulate(CliStrings.BACKUP_DISK_STORE_MSG_HOST, host);
}
-
@CliCommand(value = CliStrings.LIST_DISK_STORE, help = CliStrings.LIST_DISK_STORE__HELP)
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
@@ -353,7 +347,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
diskStoreAttributes.diskDirs = directories;
diskStoreAttributes.diskDirSizes = sizes;
- diskStoreAttributes.setDiskUsageWarningPercentage(diskUsageWarningPercentage);;
+ diskStoreAttributes.setDiskUsageWarningPercentage(diskUsageWarningPercentage);
diskStoreAttributes.setDiskUsageCriticalPercentage(diskUsageCriticalPercentage);
TabularResultData tabularData = ResultBuilder.createTabularResultData();
@@ -412,7 +406,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
}
}
-
@CliCommand(value = CliStrings.COMPACT_DISK_STORE, help = CliStrings.COMPACT_DISK_STORE__HELP)
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE})
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
@@ -432,8 +425,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
CliStrings.format(CliStrings.COMPACT_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST,
new Object[] {diskStoreName}));
} else {
- InternalDistributedSystem ds =
- (InternalDistributedSystem) getCache().getDistributedSystem();
+ InternalDistributedSystem ds = getCache().getInternalDistributedSystem();
Map<DistributedMember, PersistentID> overallCompactInfo =
new HashMap<DistributedMember, PersistentID>();
@@ -538,7 +530,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
}
private boolean diskStoreExists(String diskStoreName) {
- Cache cache = getCache();
+ InternalCache cache = getCache();
ManagementService managementService = ManagementService.getExistingManagementService(cache);
DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean();
Map<String, String[]> diskstore = dsMXBean.listMemberDiskstore();
@@ -695,7 +687,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
return result;
}
-
@CliCommand(value = CliStrings.UPGRADE_OFFLINE_DISK_STORE,
help = CliStrings.UPGRADE_OFFLINE_DISK_STORE__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE})
@@ -713,7 +704,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
help = CliStrings.UPGRADE_OFFLINE_DISK_STORE__J__HELP) String[] jvmProps)
throws InterruptedException {
-
Result result = null;
LogWrapper logWrapper = LogWrapper.getInstance();
@@ -794,8 +784,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
throw new GemFireIOException(errorMessage);
}
- // do we have to waitFor??
- // upgraderProcess.waitFor();
upgraderProcess.destroy();
result = ResultBuilder.createInfoResult(output.toString());
} catch (IOException e) {
@@ -840,8 +828,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
return result;
}
-
-
private String validatedDirectories(String[] diskDirs) {
String invalidDirectories = null;
StringBuilder builder = null;
@@ -1009,8 +995,8 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
mandatory = true, help = CliStrings.REVOKE_MISSING_DISK_STORE__ID__HELP) String id) {
try {
- DistributedSystemMXBean dsMXBean = ManagementService
- .getManagementService(CacheFactory.getAnyInstance()).getDistributedSystemMXBean();
+ DistributedSystemMXBean dsMXBean =
+ ManagementService.getManagementService(getCache()).getDistributedSystemMXBean();
if (dsMXBean.revokeMissingDiskStores(id)) {
return ResultBuilder.createInfoResult("Missing disk store successfully revoked");
}
@@ -1297,10 +1283,8 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
return ResultBuilder.createGemFireErrorResult(CliStrings
.format(CliStrings.VALIDATE_DISK_STORE__MSG__ERROR, diskStoreName, ex.getMessage()));
}
-
}
-
@CliCommand(value = CliStrings.ALTER_DISK_STORE, help = CliStrings.ALTER_DISK_STORE__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE})
public Result alterOfflineDiskStore(
@@ -1456,7 +1440,6 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
}
}
-
if (!accumulatedData) {
return ResultBuilder.createInfoResult("No matching disk stores found.");
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 7afb0db..dfd20a9 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,15 +14,29 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toSet;
+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 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.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.GemFireCacheImpl;
+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;
@@ -44,24 +58,9 @@ 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
- *
*/
@SuppressWarnings("unused")
public class ExportImportClusterConfigurationCommands extends AbstractCommandsSupport {
@@ -117,7 +116,6 @@ public class ExportImportClusterConfigurationCommands extends AbstractCommandsSu
return result;
}
-
@CliCommand(value = {CliStrings.IMPORT_SHARED_CONFIG},
help = CliStrings.IMPORT_SHARED_CONFIG__HELP)
@CliMetaData(
@@ -136,7 +134,7 @@ public class ExportImportClusterConfigurationCommands extends AbstractCommandsSu
return ResultBuilder.buildResult(errorData);
}
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = getCache();
Set<DistributedMember> servers = CliUtil.getAllNormalMembers(cache);
@@ -149,7 +147,6 @@ public class ExportImportClusterConfigurationCommands extends AbstractCommandsSu
+ regionsWithData.stream().collect(joining(",")));
}
-
byte[][] shellBytesData = CommandExecutionContext.getBytesFromShell();
String zipFileName = CliUtil.bytesToNames(shellBytesData)[0];
byte[] zipBytes = CliUtil.bytesToData(shellBytesData)[0];
@@ -261,7 +258,6 @@ public class ExportImportClusterConfigurationCommands extends AbstractCommandsSu
}
}
-
public static class ImportInterceptor extends AbstractCliAroundInterceptor {
public Result preExecution(GfshParseResult parseResult) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
index 647fff2..20ec1f5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
@@ -12,14 +12,30 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.cli.commands;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
@@ -34,21 +50,6 @@ import org.apache.geode.management.internal.cli.util.ExportLogsCacheWriter;
import org.apache.geode.management.internal.configuration.utils.ZipUtils;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-import org.apache.logging.log4j.Logger;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
public class ExportLogsCommand implements CommandMarker {
@@ -61,6 +62,10 @@ public class ExportLogsCommand implements CommandMarker {
private static final Pattern DISK_SPACE_LIMIT_PATTERN = Pattern.compile("(\\d+)([mgtMGT]?)");
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@CliCommand(value = CliStrings.EXPORT_LOGS, help = CliStrings.EXPORT_LOGS__HELP)
@CliMetaData(shellOnly = false, isFileDownloadOverHttp = true,
interceptor = "org.apache.geode.management.internal.cli.commands.ExportLogsInterceptor",
@@ -103,7 +108,7 @@ public class ExportLogsCommand implements CommandMarker {
// specifiedDefaultValue = CliStrings.EXPORT_LOGS__FILESIZELIMIT__SPECIFIED_DEFAULT,
// help = CliStrings.EXPORT_LOGS__FILESIZELIMIT__HELP) String fileSizeLimit) {
Result result = null;
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = getCache();
try {
Set<DistributedMember> targetMembers =
CliUtil.findMembersIncludingLocators(groups, memberIds);
@@ -194,13 +199,6 @@ public class ExportLogsCommand implements CommandMarker {
ZipUtils.zipDirectory(exportedLogsDir, exportedLogsZipFile);
FileUtils.deleteDirectory(tempDir.toFile());
- // try {
- // isFileSizeCheckEnabledAndWithinLimit(parseFileSizeLimit(fileSizeLimit),
- // exportedLogsZipFile.toFile());
- // } catch (IllegalArgumentException e) {
- // return ResultBuilder.createUserErrorResult("TOO BIG: fileSizeLimit = " + fileSizeLimit);
- // }
-
result = ResultBuilder.createInfoResult(exportedLogsZipFile.toString());
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
index e21a334..d19f91b 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/FunctionCommands.java
@@ -14,8 +14,21 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import java.util.ArrayList;
+import java.util.Arrays;
+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 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.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
@@ -25,7 +38,7 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.cli.CliMetaData;
@@ -51,32 +64,23 @@ 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.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.Arrays;
-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;
/**
- *
* @since GemFire 7.0
*/
@SuppressWarnings("unused")
public class FunctionCommands implements CommandMarker {
+
private final ListFunctionFunction listFunctionFunction = new ListFunctionFunction();
private Gfsh getGfsh() {
return Gfsh.getCurrentInstance();
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@CliCommand(value = CliStrings.EXECUTE_FUNCTION, help = CliStrings.EXECUTE_FUNCTION__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_FUNCTION})
@ResourceOperation(resource = Resource.DATA, operation = Operation.WRITE)
@@ -176,8 +180,7 @@ public class FunctionCommands implements CommandMarker {
return result;
}
- Cache cache = CacheFactory.getAnyInstance();
-
+ InternalCache cache = getCache();
if (resultCollector != null) {
resultCollectorInstance =
@@ -208,11 +211,10 @@ public class FunctionCommands implements CommandMarker {
} else if (onRegion != null && onRegion.length() > 0) {
if (cache.getRegion(onRegion) == null) {
// find a member where region is present
- DistributedRegionMXBean bean =
- ManagementService.getManagementService(GemFireCacheImpl.getInstance())
- .getDistributedRegionMXBean(onRegion);
+ DistributedRegionMXBean bean = ManagementService.getManagementService(getCache())
+ .getDistributedRegionMXBean(onRegion);
if (bean == null) {
- bean = ManagementService.getManagementService(GemFireCacheImpl.getInstance())
+ bean = ManagementService.getManagementService(getCache())
.getDistributedRegionMXBean(Region.SEPARATOR + onRegion);
if (bean == null) {
@@ -350,7 +352,7 @@ public class FunctionCommands implements CommandMarker {
return result;
}
- DistributedMember getMember(Cache cache, String memberNameOrId) {
+ DistributedMember getMember(InternalCache cache, String memberNameOrId) {
DistributedMember member = null;
Set<DistributedMember> dsMembers = CliUtil.getAllMembers(cache);
Iterator<DistributedMember> it = dsMembers.iterator();
@@ -365,8 +367,8 @@ public class FunctionCommands implements CommandMarker {
}
void executeAndGetResults(String functionId, String filterString, String resultCollector,
- String[] arguments, Cache cache, DistributedMember member, TabularResultData resultTable,
- String onRegion) {
+ String[] arguments, InternalCache cache, DistributedMember member,
+ TabularResultData resultTable, String onRegion) {
StringBuilder resultMessege = new StringBuilder();
try {
Function function = new UserFunctionExecution();
@@ -448,7 +450,7 @@ public class FunctionCommands implements CommandMarker {
help = CliStrings.DESTROY_FUNCTION__ONMEMBER__HELP) String memberId) {
Result result = null;
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Set<DistributedMember> dsMembers = new HashSet<DistributedMember>();
if (groups != null && memberId != null) {
return ResultBuilder
@@ -479,7 +481,6 @@ public class FunctionCommands implements CommandMarker {
result = ResultBuilder.buildResult(errorResultData);
return result;
}
-
}
/**
@@ -510,7 +511,7 @@ public class FunctionCommands implements CommandMarker {
}
}
- Result executeFunction(Cache cache, Set<DistributedMember> DsMembers, String functionId) {
+ Result executeFunction(InternalCache cache, Set<DistributedMember> DsMembers, String functionId) {
// unregister on a set of of members
Function unregisterFunction = new UnregisterFunction();
FunctionService.registerFunction(unregisterFunction);
@@ -565,7 +566,7 @@ public class FunctionCommands implements CommandMarker {
TabularResultData tabularData = ResultBuilder.createTabularResultData();
boolean accumulatedData = false;
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Set<DistributedMember> targetMembers;
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 080d520..1a7e2df 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
@@ -22,6 +22,7 @@ import org.apache.geode.cache.execute.Execution;
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.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.security.IntegratedSecurityService;
@@ -85,7 +86,7 @@ public class IndexCommands extends AbstractCommandsSupport {
private SecurityService securityService = IntegratedSecurityService.getSecurityService();
@Override
- protected Set<DistributedMember> getMembers(final Cache cache) {
+ protected Set<DistributedMember> getMembers(final InternalCache cache) {
// TODO determine what this does (as it is untested and unmockable!)
return CliUtil.getAllMembers(cache);
}
[2/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
index b5fb9fe..6b63f09 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommands.java
@@ -14,9 +14,44 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+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.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+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 java.util.zip.DataFormatException;
+import java.util.zip.GZIPInputStream;
+
+import javax.management.ObjectName;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
+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.geode.LogWriter;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
@@ -30,7 +65,9 @@ import org.apache.geode.distributed.internal.deadlock.Dependency;
import org.apache.geode.distributed.internal.deadlock.DependencyGraph;
import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetector;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.DistributedSystemMXBean;
@@ -70,49 +107,15 @@ import org.apache.geode.management.internal.cli.result.ResultData;
import org.apache.geode.management.internal.cli.result.ResultDataException;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.internal.logging.log4j.LogLevel;
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.CommandMarker;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-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.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-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 java.util.zip.DataFormatException;
-import java.util.zip.GZIPInputStream;
-import javax.management.ObjectName;
/**
* @since GemFire 7.0
*/
public class MiscellaneousCommands implements CommandMarker {
+
public static final String NETSTAT_FILE_REQUIRED_EXTENSION = ".txt";
public final static String DEFAULT_TIME_OUT = "10";
private final static Logger logger = LogService.getLogger();
@@ -123,6 +126,9 @@ public class MiscellaneousCommands implements CommandMarker {
return Gfsh.getCurrentInstance();
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
public void shutdownNode(final long timeout, final Set<DistributedMember> includeMembers)
throws TimeoutException, InterruptedException, ExecutionException {
@@ -145,7 +151,6 @@ public class MiscellaneousCommands implements CommandMarker {
}
return "SUCCESS";
}
-
};
Future<String> result = exec.submit(shutdownNodes);
@@ -163,10 +168,8 @@ public class MiscellaneousCommands implements CommandMarker {
} finally {
exec.shutdownNow();
}
-
}
-
@CliCommand(value = CliStrings.SHUTDOWN, help = CliStrings.SHUTDOWN__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_LIFECYCLE},
interceptor = "org.apache.geode.management.internal.cli.commands.MiscellaneousCommands$Interceptor")
@@ -185,7 +188,7 @@ public class MiscellaneousCommands implements CommandMarker {
// convert to mili-seconds
long timeout = userSpecifiedTimeout * 1000;
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
int numDataNodes = CliUtil.getAllNormalMembers(cache).size();
@@ -199,9 +202,7 @@ public class MiscellaneousCommands implements CommandMarker {
return ResultBuilder.createInfoResult(CliStrings.SHUTDOWN__MSG__NO_DATA_NODE_FOUND);
}
- GemFireCacheImpl gemFireCache = (GemFireCacheImpl) cache;
- String managerName =
- gemFireCache.getJmxManagerAdvisor().getDistributionManager().getId().getId();
+ String managerName = cache.getJmxManagerAdvisor().getDistributionManager().getId().getId();
final DistributedMember manager = CliUtil.getDistributedMemberByNameOrId(managerName);
@@ -251,7 +252,6 @@ public class MiscellaneousCommands implements CommandMarker {
// @TODO. List all the nodes which could be successfully shutdown
return ResultBuilder.createInfoResult("Shutdown is triggered");
-
}
/**
@@ -269,10 +269,8 @@ public class MiscellaneousCommands implements CommandMarker {
long timeElapsed = shutDownTimeEnd - shutDownTimeStart;
- if (timeElapsed > timeout || Boolean.getBoolean("ThrowTimeoutException")) { // The second check
- // for
- // ThrowTimeoutException
- // is a test hook
+ if (timeElapsed > timeout || Boolean.getBoolean("ThrowTimeoutException")) {
+ // The second check for ThrowTimeoutException is a test hook
throw new TimeoutException();
}
return timeElapsed;
@@ -310,7 +308,7 @@ public class MiscellaneousCommands implements CommandMarker {
@CliOption(key = CliStrings.GC__MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
help = CliStrings.GC__MEMBER__HELP) String memberId) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Result result = null;
CompositeResultData gcResultTable = ResultBuilder.createCompositeResultData();
TabularResultData resultTable = gcResultTable.addSection().addTable("Table1");
@@ -324,25 +322,24 @@ public class MiscellaneousCommands implements CommandMarker {
.createGemFireErrorResult(memberId + CliStrings.GC__MSG__MEMBER_NOT_FOUND);
}
dsMembers.add(member);
- result = executeAndBuildResult(cache, resultTable, dsMembers);
+ result = executeAndBuildResult(resultTable, dsMembers);
} else if (groups != null && groups.length > 0) {
for (String group : groups) {
dsMembers.addAll(cache.getDistributedSystem().getGroupMembers(group));
}
- result = executeAndBuildResult(cache, resultTable, dsMembers);
+ result = executeAndBuildResult(resultTable, dsMembers);
} else {
// gc on entire cluster
// exclude locators
dsMembers = CliUtil.getAllNormalMembers(cache);
- result = executeAndBuildResult(cache, resultTable, dsMembers);
+ result = executeAndBuildResult(resultTable, dsMembers);
}
return result;
}
- Result executeAndBuildResult(Cache cache, TabularResultData resultTable,
- Set<DistributedMember> dsMembers) {
+ Result executeAndBuildResult(TabularResultData resultTable, Set<DistributedMember> dsMembers) {
try {
List<?> resultList = null;
Function garbageCollectionFunction = new GarbageCollectionFunction();
@@ -391,7 +388,6 @@ public class MiscellaneousCommands implements CommandMarker {
table.accumulate(CliStrings.GC__MSG__TOTAL_TIME_IN_GC, timeTaken);
}
-
@CliCommand(value = CliStrings.NETSTAT, help = CliStrings.NETSTAT__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
@@ -568,7 +564,7 @@ public class MiscellaneousCommands implements CommandMarker {
return ResultBuilder
.createUserErrorResult(CliStrings.format(CliStrings.INVALID_FILE_EXTENSION, ".txt"));
}
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Set<DistributedMember> allMembers = CliUtil.getAllMembers(cache);
GemFireDeadlockDetector gfeDeadLockDetector = new GemFireDeadlockDetector(allMembers);
@@ -617,7 +613,7 @@ public class MiscellaneousCommands implements CommandMarker {
help = CliStrings.SHOW_LOG_LINE_NUM_HELP, mandatory = false) int numberOfLines) {
Result result = null;
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
MemberMXBean bean = null;
@@ -651,7 +647,6 @@ public class MiscellaneousCommands implements CommandMarker {
ResultBuilder.createErrorResultData().setErrorCode(ResultBuilder.ERRORCODE_DEFAULT)
.addLine(memberNameOrId + CliStrings.SHOW_LOG_MSG_MEMBER_NOT_FOUND);
return (ResultBuilder.buildResult(errorResultData));
-
}
result = ResultBuilder.buildResult(resultData);
@@ -660,7 +655,6 @@ public class MiscellaneousCommands implements CommandMarker {
ResultBuilder.createErrorResultData().setErrorCode(ResultBuilder.ERRORCODE_DEFAULT)
.addLine(memberNameOrId + CliStrings.SHOW_LOG_MSG_MEMBER_NOT_FOUND);
return (ResultBuilder.buildResult(errorResultData));
-
}
} catch (Exception e) {
@@ -670,11 +664,8 @@ public class MiscellaneousCommands implements CommandMarker {
return result;
}
- /****
+ /**
* Current implementation supports writing it to a file and returning the location of the file
- *
- * @param memberNameOrId
- * @return Stack Trace
*/
@CliCommand(value = CliStrings.EXPORT_STACKTRACE, help = CliStrings.EXPORT_STACKTRACE__HELP)
@CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@@ -706,9 +697,8 @@ public class MiscellaneousCommands implements CommandMarker {
CliStrings.EXPORT_STACKTRACE__ERROR__FILE__PRESENT, outFile.getCanonicalPath()));
}
- Cache cache = CacheFactory.getAnyInstance();
- GemFireCacheImpl gfeCacheImpl = (GemFireCacheImpl) cache;
- InternalDistributedSystem ads = gfeCacheImpl.getSystem();
+ InternalCache cache = getCache();
+ InternalDistributedSystem ads = cache.getInternalDistributedSystem();
InfoResultData resultData = ResultBuilder.createInfoResultData();
@@ -778,7 +768,6 @@ public class MiscellaneousCommands implements CommandMarker {
* @throws IOException
*/
private String writeStacksToFile(Map<String, byte[]> dumps, String fileName) throws IOException {
-
String filePath = null;
OutputStream os = null;
PrintWriter ps = null;
@@ -897,17 +886,15 @@ public class MiscellaneousCommands implements CommandMarker {
return result;
}
- /****
+ /**
* Gets the system wide metrics
*
- * @param export_to_report_to
* @return ResultData with required System wide statistics or ErrorResultData if DS MBean is not
* found to gather metrics
- * @throws Exception
*/
private ResultData getSystemWideMetrics(String export_to_report_to, String[] categoriesArr)
throws Exception {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final ManagementService managmentService = ManagementService.getManagementService(cache);
DistributedSystemMXBean dsMxBean = managmentService.getDistributedSystemMXBean();
StringBuilder csvBuilder = null;
@@ -1001,14 +988,11 @@ public class MiscellaneousCommands implements CommandMarker {
CliStrings.format(CliStrings.SHOW_METRICS__ERROR, "Distributed System MBean not found");
return ResultBuilder.createErrorResultData().addLine(errorMessage);
}
-
}
- /***
+ /**
* Gets the Cluster wide metrics for a given member
*
- * @param distributedMember
- * @param export_to_report_to
* @return ResultData with required Member statistics or ErrorResultData if MemberMbean is not
* found to gather metrics
* @throws ResultDataException if building result fails
@@ -1016,7 +1000,7 @@ public class MiscellaneousCommands implements CommandMarker {
private ResultData getMemberMetrics(DistributedMember distributedMember,
String export_to_report_to, String[] categoriesArr, int cacheServerPort)
throws ResultDataException {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final SystemManagementService managementService =
(SystemManagementService) ManagementService.getManagementService(cache);
@@ -1086,7 +1070,7 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
- /****
+ /*
* Member Metrics
*/
// member, jvm, region, serialization, communication, function, transaction, diskstore, lock,
@@ -1100,7 +1084,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "maximumHeapSize", memberMxBean.getMaximumHeapSize(),
csvBuilder);
}
- /****
+ /*
* JVM Metrics
*/
if (categoriesMap.get("jvm").booleanValue()) {
@@ -1111,7 +1095,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "totalFileDescriptorOpen",
memberMxBean.getTotalFileDescriptorOpen(), csvBuilder);
}
- /***
+ /*
* Member wide region metrics
*/
if (categoriesMap.get("region").booleanValue()) {
@@ -1170,10 +1154,9 @@ public class MiscellaneousCommands implements CommandMarker {
memberMxBean.getCacheListenerCallsAvgLatency(), csvBuilder);
writeToTableAndCsv(metricsTable, "", "totalLoadsCompleted",
memberMxBean.getTotalLoadsCompleted(), csvBuilder);
-
}
- /******
+ /*
* SERIALIZATION
*/
if (categoriesMap.get("serialization").booleanValue()) {
@@ -1193,9 +1176,8 @@ public class MiscellaneousCommands implements CommandMarker {
memberMxBean.getPDXDeserializationRate(), csvBuilder);
}
- /***
+ /*
* Communication Metrics
- *
*/
if (categoriesMap.get("communication").booleanValue()) {
writeToTableAndCsv(metricsTable, "communication", "bytesSentRate",
@@ -1209,12 +1191,10 @@ public class MiscellaneousCommands implements CommandMarker {
String[] connectedGatewaySenders = memberMxBean.listConnectedGatewaySenders();
writeToTableAndCsv(metricsTable, "", "connectedGatewaySenders", connectedGatewaySenders,
csvBuilder);
-
}
- /***
+ /*
* Member wide function metrics
- *
*/
if (categoriesMap.get("function").booleanValue()) {
writeToTableAndCsv(metricsTable, "function", "numRunningFunctions",
@@ -1228,7 +1208,7 @@ public class MiscellaneousCommands implements CommandMarker {
// memberMxBean.getFuncExecutionQueueSize(), csvBuilder);
}
- /***
+ /*
* totalTransactionsCount currentTransactionalThreadIds transactionCommitsAvgLatency
* transactionCommittedTotalCount transactionRolledBackTotalCount transactionCommitsRate
*/
@@ -1245,7 +1225,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "transactionCommitsRate",
memberMxBean.getTransactionCommitsRate(), csvBuilder);
}
- /***
+ /*
* Member wide disk metrics
*/
if (categoriesMap.get("diskstore").booleanValue()) {
@@ -1263,7 +1243,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "totalBackupInProgress",
memberMxBean.getTotalBackupInProgress(), csvBuilder);
}
- /***
+ /*
* Member wide Lock
*/
if (categoriesMap.get("lock").booleanValue()) {
@@ -1276,7 +1256,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "requestQueues", memberMxBean.getLockRequestQueues(),
csvBuilder);
}
- /****
+ /*
* Eviction
*/
if (categoriesMap.get("eviction").booleanValue()) {
@@ -1285,7 +1265,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "lruDestroyRate", memberMxBean.getLruDestroyRate(),
csvBuilder);
}
- /***
+ /*
* Distribution
*/
if (categoriesMap.get("distribution").booleanValue()) {
@@ -1297,7 +1277,7 @@ public class MiscellaneousCommands implements CommandMarker {
memberMxBean.getInitialImageKeysReceived(), csvBuilder);
}
- /***
+ /*
* OffHeap
*/
if (categoriesMap.get("offheap").booleanValue()) {
@@ -1315,7 +1295,7 @@ public class MiscellaneousCommands implements CommandMarker {
memberMxBean.getOffHeapCompactionTime(), csvBuilder);
}
- /***
+ /*
* CacheServer stats
*/
if (csMxBean != null) {
@@ -1345,7 +1325,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "putRequestRate", csMxBean.getPutRequestRate(),
csvBuilder);
- /*****
+ /*
* Notification
*/
writeToTableAndCsv(metricsTable, "notification", "numClientNotificationRequests",
@@ -1355,7 +1335,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "clientNotificationAvgLatency",
csMxBean.getClientNotificationAvgLatency(), csvBuilder);
- /***
+ /*
* Query
*/
writeToTableAndCsv(metricsTable, "query", "activeCQCount", csMxBean.getActiveCQCount(),
@@ -1369,7 +1349,6 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "index list", indexList, csvBuilder);
writeToTableAndCsv(metricsTable, "", "totalIndexMaintenanceTime",
csMxBean.getTotalIndexMaintenanceTime(), csvBuilder);
-
}
if (export_to_report_to != null && !export_to_report_to.isEmpty()) {
@@ -1386,17 +1365,16 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
- /****
+ /**
* Gets the Cluster-wide metrics for a region
*
- * @param regionName
* @return ResultData containing the table
* @throws ResultDataException if building result fails
*/
private ResultData getDistributedRegionMetrics(String regionName, String export_to_report_to,
String[] categoriesArr) throws ResultDataException {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final ManagementService managementService = ManagementService.getManagementService(cache);
DistributedRegionMXBean regionMxBean = managementService.getDistributedRegionMXBean(regionName);
@@ -1444,7 +1422,7 @@ public class MiscellaneousCommands implements CommandMarker {
return ResultBuilder.createErrorResultData().addLine(sb.toString());
}
}
- /***
+ /*
* General System metrics
*/
// cluster, region, partition , diskstore, callback, eviction
@@ -1471,7 +1449,6 @@ public class MiscellaneousCommands implements CommandMarker {
csvBuilder);
writeToTableAndCsv(metricsTable, "", "putAllRate", regionMxBean.getPutAllRate(),
csvBuilder);
-
}
if (categoriesMap.get("partition").booleanValue()) {
@@ -1495,7 +1472,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "averageBucketSize", regionMxBean.getAvgBucketSize(),
csvBuilder);
}
- /*****
+ /*
* Disk store
*/
if (categoriesMap.get("diskstore").booleanValue()) {
@@ -1511,7 +1488,7 @@ public class MiscellaneousCommands implements CommandMarker {
csvBuilder);
}
- /*****
+ /*
* LISTENER
*/
if (categoriesMap.get("callback").booleanValue()) {
@@ -1521,7 +1498,7 @@ public class MiscellaneousCommands implements CommandMarker {
regionMxBean.getCacheListenerCallsAvgLatency(), csvBuilder);
}
- /****
+ /*
* Eviction
*/
if (categoriesMap.get("eviction").booleanValue()) {
@@ -1546,12 +1523,9 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
- /***
+ /**
* Gets the metrics of region on a given member
*
- * @param regionName
- * @param distributedMember
- * @param export_to_report_to
* @return ResultData with required Region statistics or ErrorResultData if Region MBean is not
* found to gather metrics
* @throws ResultDataException if building result fails
@@ -1560,7 +1534,7 @@ public class MiscellaneousCommands implements CommandMarker {
DistributedMember distributedMember, String export_to_report_to, String[] categoriesArr)
throws ResultDataException {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final SystemManagementService managementService =
(SystemManagementService) ManagementService.getManagementService(cache);
@@ -1587,7 +1561,7 @@ public class MiscellaneousCommands implements CommandMarker {
csvBuilder.append('\n');
}
- /****
+ /*
* Region Metrics
*/
Map<String, Boolean> categoriesMap = getRegionMetricsCategories();
@@ -1657,10 +1631,8 @@ public class MiscellaneousCommands implements CommandMarker {
regionMxBean.getNumBucketsWithoutRedundancy(), csvBuilder);
writeToTableAndCsv(metricsTable, "", "totalBucketSize", regionMxBean.getTotalBucketSize(),
csvBuilder);
- // writeToTableAndCsv(metricsTable, "", "averageBucketSize",
- // regionMxBean.getAvgBucketSize(), csvBuilder);
}
- /*****
+ /*
* Disk store
*/
if (categoriesMap.get("diskstore").booleanValue()) {
@@ -1675,7 +1647,7 @@ public class MiscellaneousCommands implements CommandMarker {
writeToTableAndCsv(metricsTable, "", "diskTaskWaiting", regionMxBean.getDiskTaskWaiting(),
csvBuilder);
}
- /*****
+ /*
* LISTENER
*/
if (categoriesMap.get("callback").booleanValue()) {
@@ -1685,7 +1657,7 @@ public class MiscellaneousCommands implements CommandMarker {
regionMxBean.getCacheListenerCallsAvgLatency(), csvBuilder);
}
- /****
+ /*
* Eviction
*/
if (categoriesMap.get("eviction").booleanValue()) {
@@ -1708,18 +1680,10 @@ public class MiscellaneousCommands implements CommandMarker {
erd.addLine(errorMessage);
return erd;
}
-
}
-
/***
* Writes an entry to a TabularResultData and writes a comma separated entry to a string builder
- *
- * @param metricsTable
- * @param type
- * @param metricName
- * @param metricValue
- * @param csvBuilder
*/
private void writeToTableAndCsv(TabularResultData metricsTable, String type, String metricName,
long metricValue, StringBuilder csvBuilder) {
@@ -1737,14 +1701,6 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
- /***
- *
- * @param metricsTable
- * @param type
- * @param metricName
- * @param metricValue
- * @param csvBuilder
- */
private void writeToTableAndCsv(TabularResultData metricsTable, String type, String metricName,
double metricValue, StringBuilder csvBuilder) {
metricsTable.accumulate(CliStrings.SHOW_METRICS__TYPE__HEADER, type);
@@ -1769,7 +1725,7 @@ public class MiscellaneousCommands implements CommandMarker {
return categoriesSet;
}
- /****
+ /**
* Defines and returns map of categories for System metrics.
*
* @return map with categories for system metrics and display flag set to true
@@ -1783,7 +1739,7 @@ public class MiscellaneousCommands implements CommandMarker {
return categories;
}
- /****
+ /**
* Defines and returns map of categories for Region Metrics
*
* @return map with categories for region metrics and display flag set to true
@@ -1802,7 +1758,7 @@ public class MiscellaneousCommands implements CommandMarker {
return categories;
}
- /****
+ /**
* Defines and returns map of categories for system-wide region metrics
*
* @return map with categories for system wide region metrics and display flag set to true
@@ -1813,7 +1769,7 @@ public class MiscellaneousCommands implements CommandMarker {
return categories;
}
- /*****
+ /**
* Defines and returns map of categories for member metrics
*
* @return map with categories for member metrics and display flag set to true
@@ -1835,11 +1791,9 @@ public class MiscellaneousCommands implements CommandMarker {
return categories;
}
- /***
+ /**
* Converts an array of strings to a String delimited by a new line character for display purposes
*
- * @param names
- * @param startIndex
* @return a String delimited by a new line character for display purposes
*/
private String formatNames(String[] names, int startIndex) {
@@ -1867,14 +1821,8 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
- /***
+ /**
* Writes to a TabularResultData and also appends a CSV string to a String builder
- *
- * @param metricsTable
- * @param type
- * @param metricName
- * @param metricValue
- * @param csvBuilder
*/
private void writeToTableAndCsv(TabularResultData metricsTable, String type, String metricName,
String metricValue, StringBuilder csvBuilder) {
@@ -1892,7 +1840,6 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
-
@CliCommand(value = CliStrings.CHANGE_LOGLEVEL, help = CliStrings.CHANGE_LOGLEVEL__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_LOGS},
interceptor = "org.apache.geode.management.internal.cli.commands.MiscellaneousCommands$ChangeLogLevelInterceptor")
@@ -1911,7 +1858,7 @@ public class MiscellaneousCommands implements CommandMarker {
.createUserErrorResult(CliStrings.CHANGE_LOGLEVEL__MSG__SPECIFY_GRP_OR_MEMBER);
}
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
LogWriter logger = cache.getLogger();
Set<DistributedMember> dsMembers = new HashSet<DistributedMember>();
@@ -2008,7 +1955,6 @@ public class MiscellaneousCommands implements CommandMarker {
}
}
-
@CliAvailabilityIndicator({CliStrings.SHUTDOWN, CliStrings.GC, CliStrings.SHOW_DEADLOCK,
CliStrings.SHOW_METRICS, CliStrings.SHOW_LOG, CliStrings.EXPORT_STACKTRACE,
CliStrings.NETSTAT, CliStrings.EXPORT_LOGS, CliStrings.CHANGE_LOGLEVEL})
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 5cf5ff1..f8d27de 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
@@ -18,9 +18,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.cli.Result.Status;
@@ -35,11 +40,6 @@ 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.CommandMarker;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-
-
public class StatusCommands extends AbstractCommandsSupport implements CommandMarker {
static final FetchSharedConfigurationStatusFunction fetchSharedConfigStatusFunction =
new FetchSharedConfigurationStatusFunction();
@@ -49,7 +49,7 @@ public class StatusCommands extends AbstractCommandsSupport implements CommandMa
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_LOCATOR)
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
public Result statusSharedConfiguration() {
- final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ final InternalCache cache = GemFireCacheImpl.getInstance();
final Set<DistributedMember> locators = new HashSet<DistributedMember>(
cache.getDistributionManager().getAllHostedLocatorsWithSharedConfiguration().keySet());
if (locators.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
index 62b3226..1d3e5f5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import org.apache.geode.cache.Cache;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
@@ -22,31 +25,26 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.ConfigSource;
import org.apache.geode.internal.InternalEntity;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/****
- *
- *
- */
public class AlterRuntimeConfigFunction extends FunctionAdapter implements InternalEntity {
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
String memberId = "";
try {
Object arg = context.getArguments();
- Cache trueCache = null;
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
- DistributionConfig config = cache.getSystem().getConfig();
+ InternalCache cache = getCache();
+ DistributionConfig config = cache.getInternalDistributedSystem().getConfig();
memberId = cache.getDistributedSystem().getDistributedMember().getId();
Map<String, String> runtimeAttributes = (Map<String, String>) arg;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction.java
index 816f76a..8cd67a0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction.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 java.io.Serializable;
@@ -23,29 +22,32 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-
-
/**
+ * TODO: rename ContunuousQueryFunction
*
* @since GemFire 8.0
*/
-
public class ContunuousQueryFunction implements Function, InternalEntity {
- public static final String ID = ContunuousQueryFunction.class.getName();
private static final long serialVersionUID = 1L;
+ public static final String ID = ContunuousQueryFunction.class.getName();
+
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
try {
String clientID = (String) context.getArguments();
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (cache.getCacheServers().size() > 0) {
CacheServerImpl server = (CacheServerImpl) cache.getCacheServers().iterator().next();
if (server != null) {
@@ -105,13 +107,11 @@ public class ContunuousQueryFunction implements Function, InternalEntity {
.lastResult("Exception in ContunuousQueryFunction =" + e.getMessage());
}
context.getResultSender().lastResult(null);
-
}
@Override
public String getId() {
return ContunuousQueryFunction.ID;
-
}
@Override
@@ -129,14 +129,12 @@ public class ContunuousQueryFunction implements Function, InternalEntity {
return false;
}
- public class ClientInfo implements Serializable {
+ public static class ClientInfo implements Serializable {
private static final long serialVersionUID = 1L;
public String isDurable;
public String primaryServer;
public String secondaryServer;
-
-
public ClientInfo(String IsClientDurable, String primaryServerId, String secondaryServerId) {
isDurable = IsClientDurable;
primaryServer = primaryServerId;
@@ -148,8 +146,5 @@ public class ContunuousQueryFunction implements Function, InternalEntity {
return "ClientInfo [isDurable=" + isDurable + ", primaryServer=" + primaryServer
+ ", secondaryServer=" + secondaryServer + "]";
}
-
-
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
index 8bd603b..aab19be 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
@@ -14,16 +14,11 @@
*/
package org.apache.geode.management.internal.cli.functions;
-/**
- * Function used by the 'create async-event-queue' gfsh command to create an asynchronous event
- * queue on a member.
- *
- * @since GemFire 8.0
- */
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import joptsimple.internal.Strings;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
@@ -34,25 +29,34 @@ import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter;
+import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalDataSerializer;
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.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import joptsimple.internal.Strings;
+/**
+ * Function used by the 'create async-event-queue' gfsh command to create an asynchronous event
+ * queue on a member.
+ *
+ * @since GemFire 8.0
+ */
public class CreateAsyncEventQueueFunction extends FunctionAdapter implements InternalEntity {
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@SuppressWarnings("deprecation")
@Override
public void execute(FunctionContext context) {
@@ -62,7 +66,7 @@ public class CreateAsyncEventQueueFunction extends FunctionAdapter implements In
try {
AsyncEventQueueFunctionArgs aeqArgs = (AsyncEventQueueFunctionArgs) context.getArguments();
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
index 944044b..3b4679c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction.java
@@ -19,9 +19,9 @@ package org.apache.geode.management.internal.cli.functions;
*
* @since GemFire 8.0
*/
+
import org.apache.logging.log4j.Logger;
-import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
@@ -31,7 +31,7 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.DiskStoreAttributes;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -41,6 +41,10 @@ public class CreateDiskStoreFunction extends FunctionAdapter implements Internal
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
@@ -50,7 +54,7 @@ public class CreateDiskStoreFunction extends FunctionAdapter implements Internal
final String diskStoreName = (String) args[0];
final DiskStoreAttributes diskStoreAttrs = (DiskStoreAttributes) args[01];
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
index 421f9d7..f1b1cd6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
@@ -15,23 +15,21 @@
package org.apache.geode.management.internal.cli.functions;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import org.apache.geode.internal.ClassPathLoader;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.InternalEntity;
+import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.DeployedJar;
+import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.JarDeployer;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
public class DeployFunction implements Function, InternalEntity {
@@ -41,6 +39,10 @@ public class DeployFunction implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
@@ -50,10 +52,10 @@ public class DeployFunction implements Function, InternalEntity {
final Object[] args = (Object[]) context.getArguments();
final String[] jarFilenames = (String[]) args[0];
final byte[][] jarBytes = (byte[][]) args[1];
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
- final JarDeployer jarDeployer = new JarDeployer(((GemFireCacheImpl) cache)
- .getInternalDistributedSystem().getConfig().getDeployWorkingDir());
+ final JarDeployer jarDeployer =
+ new JarDeployer(cache.getInternalDistributedSystem().getConfig().getDeployWorkingDir());
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
index 84dde7f..c25a534 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
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.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -34,12 +34,15 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
*
* @since GemFire 8.0
*/
-
public class DestroyDiskStoreFunction extends FunctionAdapter implements InternalEntity {
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
@@ -49,7 +52,7 @@ public class DestroyDiskStoreFunction extends FunctionAdapter implements Interna
final Object[] args = (Object[]) context.getArguments();
final String diskStoreName = (String) args[0];
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
index fd5d6a4..663a08e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
@@ -15,7 +15,21 @@
*/
package org.apache.geode.management.internal.cli.functions;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.file.Path;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Arrays;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -25,27 +39,15 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.internal.DistributionConfig;
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.cache.InternalRegionArguments;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.cli.commands.ExportLogsCommand;
import org.apache.geode.management.internal.cli.util.ExportLogsCacheWriter;
import org.apache.geode.management.internal.cli.util.LogExporter;
import org.apache.geode.management.internal.cli.util.LogFilter;
-import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.file.Path;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Arrays;
/**
* this function extracts the logs using a LogExporter which creates a zip file, and then writes the
@@ -55,21 +57,21 @@ import java.util.Arrays;
* The function only extracts .log and .gfs files under server's working directory
*/
public class ExportLogsFunction implements Function, InternalEntity {
+ private static final Logger logger = LogService.getLogger();
public static final String EXPORT_LOGS_REGION = "__exportLogsRegion";
- private static final Logger LOGGER = LogService.getLogger();
private static final long serialVersionUID = 1L;
private static final int BUFFER_SIZE = 1024;
@Override
public void execute(final FunctionContext context) {
try {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
DistributionConfig config = cache.getInternalDistributedSystem().getConfig();
String memberId = cache.getDistributedSystem().getMemberId();
- LOGGER.info("ExportLogsFunction started for member {}", memberId);
+ logger.info("ExportLogsFunction started for member {}", memberId);
Region exportLogsRegion = createOrGetExistingExportLogsRegion(false, cache);
@@ -95,7 +97,7 @@ public class ExportLogsFunction implements Function, InternalEntity {
return;
}
- LOGGER.info("Streaming zipped file: " + exportedZipFile.toString());
+ logger.info("Streaming zipped file: " + exportedZipFile.toString());
try (FileInputStream inputStream = new FileInputStream(exportedZipFile.toFile())) {
byte[] buffer = new byte[BUFFER_SIZE];
@@ -113,13 +115,13 @@ public class ExportLogsFunction implements Function, InternalEntity {
} catch (Exception e) {
e.printStackTrace();
- LOGGER.error(e);
+ logger.error(e);
context.getResultSender().sendException(e);
}
}
public static Region createOrGetExistingExportLogsRegion(boolean isInitiatingMember,
- GemFireCacheImpl cache) throws IOException, ClassNotFoundException {
+ InternalCache cache) throws IOException, ClassNotFoundException {
Region exportLogsRegion = cache.getRegion(EXPORT_LOGS_REGION);
if (exportLogsRegion == null) {
@@ -140,8 +142,7 @@ public class ExportLogsFunction implements Function, InternalEntity {
return exportLogsRegion;
}
- public static void destroyExportLogsRegion(GemFireCacheImpl cache) {
-
+ public static void destroyExportLogsRegion(InternalCache cache) {
Region exportLogsRegion = cache.getRegion(EXPORT_LOGS_REGION);
if (exportLogsRegion == null) {
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 ff65471..57d209b 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
@@ -20,6 +20,7 @@ import org.apache.geode.distributed.DistributedMember;
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;
@@ -31,7 +32,7 @@ public class FetchSharedConfigurationStatusFunction extends FunctionAdapter
@Override
public void execute(FunctionContext context) {
InternalLocator locator = InternalLocator.getLocator();
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
SharedConfigurationStatus status = locator.getSharedConfigurationStatus().getStatus();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
index 3d6a321..88a77be 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
@@ -21,7 +21,6 @@ import org.apache.geode.internal.DeployedJar;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
@@ -29,7 +28,7 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.JarDeployer;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
public class ListDeployedFunction implements Function, InternalEntity {
@@ -39,13 +38,17 @@ public class ListDeployedFunction implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
String memberId = "";
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
final JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer();
DistributedMember member = cache.getDistributedSystem().getDistributedMember();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction.java
index 441486e..ca66b6a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction.java
@@ -19,8 +19,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
@@ -62,7 +60,7 @@ public class ShowMissingDiskStoresFunction extends FunctionAdapter implements In
}
}
// Missing colocated regions
- Set<PartitionedRegion> prs = ((GemFireCacheImpl) cache).getPartitionedRegions();
+ Set<PartitionedRegion> prs = cache.getPartitionedRegions();
for (PartitionedRegion pr : prs) {
List<String> missingChildRegions = pr.getMissingColocatedChildren();
for (String child : missingChildRegions) {
@@ -96,4 +94,3 @@ public class ShowMissingDiskStoresFunction extends FunctionAdapter implements In
return getClass().getName();
}
}
-
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
index 06af662..8d20dc0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
@@ -14,36 +14,32 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Arrays;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
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.logging.LogService;
import org.apache.geode.management.internal.cli.util.LogFilter;
import org.apache.geode.management.internal.cli.util.LogSizer;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Arrays;
public class SizeExportLogsFunction extends ExportLogsFunction implements Function, InternalEntity {
private static final Logger LOGGER = LogService.getLogger();
private static final long serialVersionUID = 1L;
- protected Cache getCache() {
- return CacheFactory.getAnyInstance();
- }
-
@Override
public void execute(final FunctionContext context) {
try {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
DistributionConfig config = cache.getInternalDistributedSystem().getConfig();
Args args = (Args) context.getArguments();
long diskAvailable = config.getLogFile().getUsableSpace();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
index 14d875e..64ed367 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
@@ -22,7 +22,6 @@ import org.apache.geode.internal.ClassPathLoader;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
@@ -31,7 +30,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.DeployedJar;
import org.apache.geode.internal.JarDeployer;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
public class UndeployFunction implements Function, InternalEntity {
@@ -41,6 +40,10 @@ public class UndeployFunction implements Function, InternalEntity {
private static final long serialVersionUID = 1L;
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
@@ -49,7 +52,7 @@ public class UndeployFunction implements Function, InternalEntity {
try {
final Object[] args = (Object[]) context.getArguments();
final String jarFilenameList = (String) args[0]; // Comma separated
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
final JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer();
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
index 0fd8876..bd942c7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction.java
@@ -20,6 +20,7 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
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.cache.LocalRegion;
import java.util.Set;
@@ -27,7 +28,7 @@ import java.util.Set;
public class GetRegionNamesFunction implements Function, InternalEntity {
@Override
public void execute(FunctionContext context) {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
Set<String> regions =
cache.getApplicationRegions().stream().map(LocalRegion::getName).collect(toSet());
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction.java
index 464a651..a00a79e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction.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.configuration.functions;
import org.apache.geode.cache.execute.Function;
@@ -21,13 +20,14 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
public class RecreateCacheFunction implements Function, InternalEntity {
@Override
public void execute(FunctionContext context) {
CliFunctionResult result = null;
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
DistributedSystem ds = cache.getDistributedSystem();
CacheConfig cacheConfig = cache.getCacheConfig();
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactRequest.java
index dfd5d88..2b22d27 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/messages/CompactRequest.java
@@ -33,27 +33,27 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.internal.admin.remote.AdminMultipleReplyProcessor;
import org.apache.geode.internal.admin.remote.AdminRequest;
import org.apache.geode.internal.admin.remote.AdminResponse;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
/**
* An instruction to all members with cache that they should compact their disk stores.
- *
- *
+ * <p>
+ * NOTE: Extracted from org/apache/geode/internal/admin/remote/CompactRequest.java
+ *
* @since GemFire 7.0
*/
-// NOTE: This is copied from org/apache/geode/internal/admin/remote/CompactRequest.java
-// and modified as per requirements. (original-author Dan Smith)
public class CompactRequest extends AdminRequest {
private static final Logger logger = LogService.getLogger();
private String diskStoreName;
+
private static String notExecutedMembers;
public static Map<DistributedMember, PersistentID> send(DM dm, String diskStoreName,
@@ -103,7 +103,7 @@ public class CompactRequest extends AdminRequest {
public static PersistentID compactDiskStore(String diskStoreName) {
PersistentID persistentID = null;
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
DiskStoreImpl diskStore = (DiskStoreImpl) cache.findDiskStore(diskStoreName);
if (diskStore != null && diskStore.forceCompaction()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 e93363a..0b64a44 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
@@ -25,6 +25,7 @@ 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;
@@ -32,7 +33,20 @@ 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;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
@@ -51,18 +65,6 @@ import org.apache.geode.management.internal.web.controllers.support.LoginHandler
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;
-
/**
* The AbstractCommandsController class is the abstract base class encapsulating common
* functionality across all Management Controller classes that expose REST API web service endpoints
@@ -89,22 +91,24 @@ public abstract class AbstractCommandsController {
private Class accessControlKlass;
+ private InternalCache getCache() {
+ return GemFireCacheImpl.getInstance();
+ }
// Convert a predefined exception to an HTTP Status code
@ResponseStatus(value = HttpStatus.UNAUTHORIZED, reason = "Not authenticated") // 401
@ExceptionHandler(org.apache.geode.security.AuthenticationFailedException.class)
public void authenticate() {
-
+ // nothing
}
// Convert a predefined exception to an HTTP Status code
@ResponseStatus(value = HttpStatus.FORBIDDEN, reason = "Access Denied") // 403
@ExceptionHandler(java.lang.SecurityException.class)
public void authorize() {
-
+ // nothing
}
-
/**
* Asserts the argument is valid, as determined by the caller passing the result of an evaluated
* expression to this assertion.
@@ -449,8 +453,8 @@ public abstract class AbstractCommandsController {
*/
protected synchronized MemberMXBean getManagingMemberMXBean() {
if (managingMemberMXBeanProxy == null) {
- SystemManagementService service = (SystemManagementService) ManagementService
- .getExistingManagementService(GemFireCacheImpl.getInstance());
+ SystemManagementService service =
+ (SystemManagementService) ManagementService.getExistingManagementService(getCache());
MBeanServer mbs = getMBeanServer();
final DistributedSystemMXBean distributedSystemMXBean = JMX.newMXBeanProxy(mbs,
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/CheckTypeRegistryState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/CheckTypeRegistryState.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/CheckTypeRegistryState.java
index 8e628bf..d3e9f4f 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/CheckTypeRegistryState.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/CheckTypeRegistryState.java
@@ -28,10 +28,12 @@ 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.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInitializationException;
public class CheckTypeRegistryState extends HighPriorityDistributionMessage
implements MessageWithReply {
+
private int processorId;
public CheckTypeRegistryState() {
@@ -68,7 +70,7 @@ public class CheckTypeRegistryState extends HighPriorityDistributionMessage
protected void process(DistributionManager dm) {
ReplyException e = null;
try {
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
TypeRegistry pdxRegistry = cache.getPdxRegistry();
if (pdxRegistry != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
index f8acaad..d429601 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.pdx.internal;
-import static org.apache.logging.log4j.message.MapMessage.MapFormat.JSON;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -30,8 +28,8 @@ import java.util.TreeSet;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.commons.lang.StringUtils;
+
import org.apache.geode.InternalGemFireException;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.internal.ClassPathLoader;
@@ -39,6 +37,7 @@ import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Sendable;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.tcp.ByteBufferInputStream;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
@@ -52,11 +51,9 @@ import org.apache.geode.pdx.WritablePdxInstance;
* it must call {@link #getUnmodifiableReader()} and access the super class state using it. This
* class could be changed to not extend PdxReaderImpl but to instead have an instance variable that
* is a PdxReaderImpl but that would cause this class to use more memory.
- *
+ * <p>
* We do not use this normal java io serialization when serializing this class in GemFire because
* Sendable takes precedence over Serializable.
- *
- *
*/
public class PdxInstanceImpl extends PdxReaderImpl
implements PdxInstance, Sendable, ConvertableToBytes {
@@ -87,6 +84,7 @@ public class PdxInstanceImpl extends PdxReaderImpl
* equality rule, where hash code can be same for non-equal objects.
*/
private static final int UNUSED_HASH_CODE = 0;
+
private transient volatile int cachedHashCode = UNUSED_HASH_CODE;
private static final ThreadLocal<Boolean> pdxGetObjectInProgress = new ThreadLocal<Boolean>();
@@ -144,9 +142,9 @@ public class PdxInstanceImpl extends PdxReaderImpl
private PdxWriterImpl convertToTypeWithNoDeletedFields(PdxReaderImpl ur) {
PdxOutputStream os = new PdxOutputStream();
PdxType pt = new PdxType(ur.getPdxType().getClassName(), !ur.getPdxType().getNoDomainClass());
- GemFireCacheImpl gfc = GemFireCacheImpl
+ InternalCache cache = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
- TypeRegistry tr = gfc.getPdxRegistry();
+ TypeRegistry tr = cache.getPdxRegistry();
PdxWriterImpl writer = new PdxWriterImpl(pt, tr, os);
for (PdxField field : pt.getFields()) {
if (!field.isDeleted()) {
@@ -328,15 +326,9 @@ public class PdxInstanceImpl extends PdxReaderImpl
return true;
if (obj == null) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#0 o1=<" + this + "> o2=<" +
- // obj + ">");
return false;
}
if (!(obj instanceof PdxInstanceImpl)) {
- // if (!result) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#1 o1=<" + this + "> o2=<" +
- // obj + ">");
- // }
return false;
}
final PdxInstanceImpl other = (PdxInstanceImpl) obj;
@@ -344,8 +336,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
PdxReaderImpl ur1 = getUnmodifiableReader();
if (!ur1.getPdxType().getClassName().equals(ur2.getPdxType().getClassName())) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#2 o1=<" + this + "> o2=<" +
- // obj + ">");
return false;
}
@@ -359,7 +349,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
addDefaultFields(otherFields, myFields);
}
-
Iterator<PdxField> myFieldIterator = myFields.iterator();
Iterator<PdxField> otherFieldIterator = otherFields.iterator();
while (myFieldIterator.hasNext()) {
@@ -390,8 +379,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
ByteSource myBuffer = ur1.getRaw(myType);
ByteSource otherBuffer = ur2.getRaw(otherType);
if (!myBuffer.equals(otherBuffer)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#4 o1=<" + this + ">
- // o2=<" + obj + ">");
return false;
}
}
@@ -401,8 +388,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
Object[] myArray = ur1.readObjectArray(myType);
Object[] otherArray = ur2.readObjectArray(otherType);
if (!Arrays.deepEquals(myArray, otherArray)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#5 o1=<" + this + ">
- // o2=<" + obj + ">");
return false;
}
}
@@ -413,43 +398,29 @@ public class PdxInstanceImpl extends PdxReaderImpl
Object otherObject = ur2.readObject(otherType);
if (myObject != otherObject) {
if (myObject == null) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#6 o1=<" + this + ">
- // o2=<" + obj + ">");
return false;
}
if (otherObject == null) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#7 o1=<" + this + ">
- // o2=<" + obj + ">");
return false;
}
if (myObject.getClass().isArray()) { // for bug 42976
Class<?> myComponentType = myObject.getClass().getComponentType();
Class<?> otherComponentType = otherObject.getClass().getComponentType();
if (!myComponentType.equals(otherComponentType)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#8 o1=<" + this + ">
- // o2=<" + obj + ">");
return false;
}
if (myComponentType.isPrimitive()) {
ByteSource myBuffer = getRaw(myType);
ByteSource otherBuffer = other.getRaw(otherType);
if (!myBuffer.equals(otherBuffer)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#9 o1=<" + this +
- // "> o2=<" + obj + ">");
return false;
}
} else {
if (!Arrays.deepEquals((Object[]) myObject, (Object[]) otherObject)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#10 o1=<" + this +
- // "> o2=<" + obj + ">");
return false;
}
}
} else if (!myObject.equals(otherObject)) {
- // GemFireCacheImpl.getInstance().getLogger().info("DEBUG equals#11 fn=" +
- // myType.getFieldName() + " myFieldClass=" + myObject.getClass() + "
- // otherFieldCLass=" + otherObject.getClass() + " o1=<" + this + "> o2=<" + obj + ">"
- // + "myObj=<" + myObject + "> otherObj=<" + otherObject + ">");
return false;
}
}
@@ -463,7 +434,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
return true;
}
-
/**
* Any fields that are in otherFields but not in myFields are added to myFields as defaults. When
* adding fields they are inserted in the natural sort order. Note: myFields may be modified by
@@ -483,9 +453,7 @@ public class PdxInstanceImpl extends PdxReaderImpl
StringBuilder result = new StringBuilder();
PdxReaderImpl ur = getUnmodifiableReader();
result.append("PDX[").append(ur.getPdxType().getTypeId()).append(",")
- .append(ur.getPdxType().getClassName())
- // .append(",limit=").append(this.dis.size())
- .append("]{");
+ .append(ur.getPdxType().getClassName()).append("]{");
boolean firstElement = true;
for (PdxField fieldType : ur.getPdxType().getSortedIdentityFields()) {
if (firstElement) {
@@ -494,8 +462,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
result.append(", ");
} ;
result.append(fieldType.getFieldName());
- // result.append(':').append(fieldType.getTypeIdString()); // DEBUG
- // result.append(':').append(getAbsolutePosition(fieldType)); // DEBUG
result.append("=");
try {
// TODO check to see if getField returned an array and if it did use Arrays.deepToString
@@ -663,7 +629,6 @@ public class PdxInstanceImpl extends PdxReaderImpl
return getUnmodifiableReader(fieldName).readRawField(fieldName);
}
-
public Object getDefaultValueIfFieldExistsInAnyPdxVersions(String fieldName, String className)
throws FieldNotFoundInPdxVersion {
PdxType pdxType =
[5/7] geode git commit: Change GemFireCacheImpl to InternalCache
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 82e6f68..f09bb47 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
@@ -56,7 +56,6 @@ import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.AbstractBucketRegionQueue;
import org.apache.geode.internal.cache.BucketNotFoundException;
import org.apache.geode.internal.cache.BucketRegion;
@@ -67,7 +66,7 @@ import org.apache.geode.internal.cache.DiskRegionStats;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.ForceReattemptException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -81,7 +80,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderConfigurationException;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderException;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
-import org.apache.geode.internal.cache.wan.parallel.ParallelQueueBatchRemovalMessage.ParallelQueueBatchRemovalResponse;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
@@ -119,8 +117,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
protected volatile boolean resetLastPeeked = false;
-
-
/**
* There will be one shadow pr for each of the the PartitionedRegion which has added the
* GatewaySender Fix for Bug#45917 We maintain a tempQueue to queue events when buckets are not
@@ -134,8 +130,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
* the secondary nodes to remove the events which have already been dispatched from the queue.
*/
public static final int DEFAULT_MESSAGE_SYNC_INTERVAL = 10;
+
// TODO:REF: how to change the message sync interval ? should it be common for serial and parallel
protected static volatile int messageSyncInterval = DEFAULT_MESSAGE_SYNC_INTERVAL;
+
// TODO:REF: name change for thread, as it appears in the log
private BatchRemovalThread removalThread = null;
@@ -223,16 +221,11 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
final protected int index;
+
final protected int nDispatcher;
private MetaRegionFactory metaRegionFactory;
- /**
- * A transient queue to maintain the eventSeqNum of the events that are to be sent to remote site.
- * It is cleared when the queue is cleared.
- */
- // private final BlockingQueue<Long> eventSeqNumQueue;
-
public ParallelGatewaySenderQueue(AbstractGatewaySender sender, Set<Region> userRegions, int idx,
int nDispatcher) {
this(sender, userRegions, idx, nDispatcher, new MetaRegionFactory());
@@ -249,7 +242,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
this.sender = sender;
List<Region> listOfRegions = new ArrayList<Region>(userRegions);
- // eventSeqNumQueue = new LinkedBlockingQueue<Long>();
Collections.sort(listOfRegions, new Comparator<Region>() {
@Override
public int compare(Region o1, Region o2) {
@@ -273,7 +265,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
throw new GatewaySenderConfigurationException(
LocalizedStrings.ParallelGatewaySender_0_CAN_NOT_BE_USED_WITH_REPLICATED_REGION_1
.toLocalizedString(new Object[] {this.sender.getId(), userRegion.getFullPath()}));
- // addShadowPartitionedRegionForUserRR((DistributedRegion)userRegion);
}
}
@@ -295,7 +286,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
// still, it is safer approach to synchronize it
synchronized (ParallelGatewaySenderQueue.class) {
if (removalThread == null) {
- removalThread = new BatchRemovalThread((GemFireCacheImpl) this.sender.getCache(), this);
+ removalThread = new BatchRemovalThread(this.sender.getCache(), this);
removalThread.start();
}
}
@@ -317,7 +308,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
if (this.userRegionNameToshadowPRMap.containsKey(regionName))
return;
- GemFireCacheImpl cache = (GemFireCacheImpl) sender.getCache();
+ InternalCache cache = sender.getCache();
final String prQName = getQueueName(sender.getId(), userRegion.getFullPath());
prQ = (PartitionedRegion) cache.getRegion(prQName);
if (prQ == null) {
@@ -375,8 +366,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
prQ.getPartitionAttributes());
}
- // Suranjan: TODO This should not be set on the PR but on the
- // GatewaySender
+ // TODO This should not be set on the PR but on the GatewaySender
prQ.enableConflation(sender.isBatchConflationEnabled());
// Before going ahead, make sure all the buckets of shadowPR are
@@ -391,32 +381,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
// In case of Replicated Region it may not be necessary.
- // if (sender.isPersistenceEnabled()) {
- // //Kishor: I need to write a test for this code.
- // Set<Integer> allBucketsClone = new HashSet<Integer>();
- // // allBucketsClone.addAll(allBuckets);*/
- // for (int i = 0; i < sender.getMaxParallelismForReplicatedRegion(); i++)
- // allBucketsClone.add(i);
- //
- // while (!(allBucketsClone.size() == 0)) {
- // Iterator<Integer> itr = allBucketsClone.iterator();
- // while (itr.hasNext()) {
- // InternalDistributedMember node = prQ.getNodeForBucketWrite(
- // itr.next(), null);
- // if (node != null) {
- // itr.remove();
- // }
- // }
- // // after the iteration is over, sleep for sometime before trying
- // // again
- // try {
- // Thread.sleep(WAIT_CYCLE_SHADOW_BUCKET_LOAD);
- // }
- // catch (InterruptedException e) {
- // logger.error(e);
- // }
- // }
- // }
} catch (IOException veryUnLikely) {
logger.fatal(LocalizedMessage.create(
LocalizedStrings.SingleWriteSingleReadRegionQueue_UNEXPECTED_EXCEPTION_DURING_INIT_OF_0,
@@ -453,7 +417,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
private static String convertPathToName(String fullPath) {
- // return fullPath.replaceAll("/", "_");
return "";
}
@@ -490,7 +453,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
.toLocalizedString(new Object[] {this.sender.getId(), userPR.getFullPath()}));
}
- GemFireCacheImpl cache = (GemFireCacheImpl) sender.getCache();
+ InternalCache cache = sender.getCache();
boolean isAccessor = (userPR.getLocalMaxMemory() == 0);
final String prQName = sender.getId() + QSTRING + convertPathToName(userPR.getFullPath());
@@ -549,7 +512,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
.setInternalRegion(true).setSnapshotInputStream(null).setImageTarget(null));
// at this point we should be able to assert prQ == meta;
- // Suranjan: TODO This should not be set on the PR but on the GatewaySender
+ // TODO This should not be set on the PR but on the GatewaySender
prQ.enableConflation(sender.isBatchConflationEnabled());
if (isAccessor)
return; // return from here if accessor node
@@ -576,7 +539,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
} finally {
if (prQ != null) {
-
this.userRegionNameToshadowPRMap.put(userPR.getFullPath(), prQ);
}
/*
@@ -611,7 +573,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
protected void afterRegionAdd(PartitionedRegion userPR) {
-
+ // nothing
}
/**
@@ -666,18 +628,12 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
public boolean put(Object object) throws InterruptedException, CacheException {
final boolean isDebugEnabled = logger.isDebugEnabled();
boolean putDone = false;
- // Suranjan : Can this region ever be null? Should we work with regionName and not with region
+ // Can this region ever be null? Should we work with regionName and not with region
// instance.
// It can't be as put is happeing on the region and its still under process
GatewaySenderEventImpl value = (GatewaySenderEventImpl) object;
boolean isDREvent = isDREvent(value);
- // if (isDREvent(value)) {
- // putInShadowPRForReplicatedRegion(object);
- // value.freeOffHeapValue();
- // return;
- // }
-
Region region = value.getRegion();
String regionPath = null;
if (isDREvent) {
@@ -795,11 +751,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
brq.getInitializationLock().readLock().unlock();
}
} else {
- // tempQueue = this.bucketToTempQueueMap.get(bucketId);
- // if (tempQueue == null) {
- // tempQueue = new LinkedBlockingQueue();
- // this.bucketToTempQueueMap.put(bucketId, tempQueue);
- // }
tempQueue.add(value);
putDone = true;
// For debugging purpose.
@@ -811,7 +762,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
}
}
- // }
}
} finally {
@@ -873,12 +823,9 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
try {
if (brq != null) {
addedValueToQueue = brq.addToQueue(key, value);
- // TODO : Kishor : During merge, ParallelWANstats test failed. On
+ // TODO: During merge, ParallelWANstats test failed. On
// comment below code test passed. cheetha does not have below code.
// need to find out from hcih revision this code came
- // if (brq.getBucketAdvisor().isPrimary()) {
- // this.stats.incQueueSize();
- // }
}
} catch (BucketNotFoundException e) {
if (logger.isDebugEnabled()) {
@@ -933,18 +880,13 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
return new HashSet(this.userRegionNameToshadowPRMap.values());
}
- // TODO: Suranjan Find optimal way to get Random shadow pr as this will be called in each put and
- // peek.
+ // TODO: Find optimal way to get Random shadow pr as this will be called in each put and peek.
protected PartitionedRegion getRandomShadowPR() {
PartitionedRegion prQ = null;
if (this.userRegionNameToshadowPRMap.values().size() > 0) {
int randomIndex = new Random().nextInt(this.userRegionNameToshadowPRMap.size());
prQ = (PartitionedRegion) this.userRegionNameToshadowPRMap.values().toArray()[randomIndex];
}
- // if (this.userPRToshadowPRMap.values().size() > 0
- // && (prQ == null)) {
- // prQ = getRandomShadowPR();
- // }
return prQ;
}
@@ -1029,13 +971,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
// TODO:REF: instead of shuffle use random number, in this method we are
// returning id instead we should return BRQ itself
- /*
- * Collections.shuffle(thisProcessorBuckets); for (Integer bucketId : thisProcessorBuckets) {
- * BucketRegionQueue br = (BucketRegionQueue)prQ.getDataStore()
- * .getBucketRegionQueueByBucketId(bucketId);
- *
- * if (br != null && br.isReadyForPeek()) { return br.getId(); } }
- */
}
return -1;
}
@@ -1052,9 +987,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
GatewaySenderEventImpl event = this.peekedEvents.remove();
try {
- // PartitionedRegion prQ = this.userPRToshadowPRMap.get(ColocationHelper
- // .getLeaderRegion((PartitionedRegion)event.getRegion()).getFullPath());
- //
PartitionedRegion prQ = null;
int bucketId = -1;
Object key = null;
@@ -1071,11 +1003,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
} else {
String regionPath = event.getRegionPath();
- GemFireCacheImpl cache = (GemFireCacheImpl) this.sender.getCache();
+ InternalCache cache = this.sender.getCache();
Region region = (PartitionedRegion) cache.getRegion(regionPath);
if (region != null && !region.isDestroyed()) {
- // TODO: Suranjan We have to get colocated parent region for this
- // region
+ // TODO: We have to get colocated parent region for this region
if (region instanceof DistributedRegion) {
prQ = this.userRegionNameToshadowPRMap.get(region.getFullPath());
event.getBucketId();
@@ -1105,7 +1036,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
private void destroyEventFromQueue(PartitionedRegion prQ, int bucketId, Object key) {
boolean isPrimary = prQ.getRegionAdvisor().getBucketAdvisor(bucketId).isPrimary();
BucketRegionQueue brq = getBucketRegionQueueByBucketId(prQ, bucketId);
- // TODO : Kishor : Make sure we dont need to initalize a bucket
+ // TODO : Make sure we dont need to initalize a bucket
// before destroying a key from it
try {
if (brq != null) {
@@ -1261,7 +1192,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
- blockProcesorThreadIfRequired();
+ blockProcessorThreadIfRequired();
return batch;
}
@@ -1340,7 +1271,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
this, batch.size(), size(), localSize());
}
if (batch.size() == 0) {
- blockProcesorThreadIfRequired();
+ blockProcessorThreadIfRequired();
}
return batch;
}
@@ -1400,10 +1331,9 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
}
- protected void blockProcesorThreadIfRequired() throws InterruptedException {
+ protected void blockProcessorThreadIfRequired() throws InterruptedException {
queueEmptyLock.lock();
try {
- // while (isQueueEmpty) {
if (isQueueEmpty) { // merge44610: this if condition came from cheetah 44610
if (logger.isDebugEnabled()) {
logger.debug("Going to wait, till notified.");
@@ -1414,7 +1344,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
// parameter but cedar does not have such corresponding method
queueEmptyCondition.await(1000);
// merge44610: this time waiting came from cheetah 44610
- // isQueueEmpty = this.localSize() == 0;
}
// update the flag so that next time when we come we will block.
isQueueEmpty = this.localSizeForProcessor() == 0;
@@ -1526,7 +1455,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
throw new UnsupportedOperationException();
}
-
@Override
public void remove(int batchSize) throws CacheException {
for (int i = 0; i < batchSize; i++) {
@@ -1596,14 +1524,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
@Override
public void close() {
// Because of bug 49060 do not close the regions of a parallel queue
- // for (Region r: getRegions()) {
- // if (r != null && !r.isDestroyed()) {
- // try {
- // r.close();
- // } catch (RegionDestroyedException e) {
- // }
- // }
- // }
}
/**
@@ -1634,14 +1554,14 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
*/
private volatile boolean shutdown = false;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
private final ParallelGatewaySenderQueue parallelQueue;
/**
* Constructor : Creates and initializes the thread
*/
- public BatchRemovalThread(GemFireCacheImpl c, ParallelGatewaySenderQueue queue) {
+ public BatchRemovalThread(InternalCache c, ParallelGatewaySenderQueue queue) {
super("BatchRemovalThread");
// TODO:REF: Name for this thread ?
this.setDaemon(true);
@@ -1772,7 +1692,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
}
- private Set<InternalDistributedMember> getAllRecipients(GemFireCacheImpl cache, Map map) {
+ private Set<InternalDistributedMember> getAllRecipients(InternalCache cache, Map map) {
Set recipients = new ObjectOpenHashSet();
for (Object pr : map.keySet()) {
PartitionedRegion partitionedRegion = (PartitionedRegion) cache.getRegion((String) pr);
@@ -1811,7 +1731,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
AbstractGatewaySender sender = null;
public ParallelGatewaySenderQueueMetaRegion(String regionName, RegionAttributes attrs,
- LocalRegion parentRegion, GemFireCacheImpl cache, AbstractGatewaySender pgSender) {
+ LocalRegion parentRegion, InternalCache cache, AbstractGatewaySender pgSender) {
super(regionName, attrs, parentRegion, cache,
new InternalRegionArguments().setDestroyLockFlag(true).setRecreateFlag(false)
.setSnapshotInputStream(null).setImageTarget(null)
@@ -1872,8 +1792,8 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
static class MetaRegionFactory {
- ParallelGatewaySenderQueueMetaRegion newMetataRegion(GemFireCacheImpl cache,
- final String prQName, final RegionAttributes ra, AbstractGatewaySender sender) {
+ ParallelGatewaySenderQueueMetaRegion newMetataRegion(InternalCache cache, final String prQName,
+ final RegionAttributes ra, AbstractGatewaySender sender) {
ParallelGatewaySenderQueueMetaRegion meta =
new ParallelGatewaySenderQueueMetaRegion(prQName, ra, null, cache, sender);
return meta;
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index 921af9c..a7eb9e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -38,6 +38,7 @@ import org.apache.geode.distributed.internal.PooledDistributionMessage;
import org.apache.geode.internal.cache.AbstractBucketRegionQueue;
import org.apache.geode.internal.cache.ForceReattemptException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
@@ -52,7 +53,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
*
* @since GemFire 8.0
*/
-
public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
private static final Logger logger = LogService.getLogger();
@@ -73,7 +73,7 @@ public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
@Override
protected void process(DistributionManager dm) {
final boolean isDebugEnabled = logger.isDebugEnabled();
- final GemFireCacheImpl cache;
+ final InternalCache cache;
cache = GemFireCacheImpl.getInstance();
if (cache != null) {
int oldLevel = LocalRegion.setThreadInitLevelRequirement(LocalRegion.BEFORE_INITIAL_IMAGE);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 60775a4..7928662 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
@@ -54,7 +54,6 @@ import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
@@ -73,7 +72,6 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
/**
* @since GemFire 7.0
- *
*/
public class SerialGatewaySenderQueue implements RegionQueue {
@@ -209,14 +207,12 @@ public class SerialGatewaySenderQueue implements RegionQueue {
initializeRegion(abstractSender, listener);
// Increment queue size. Fix for bug 51988.
this.stats.incQueueSize(this.region.size());
- this.removalThread = new BatchRemovalThread((GemFireCacheImpl) abstractSender.getCache());
+ this.removalThread = new BatchRemovalThread(abstractSender.getCache());
this.removalThread.start();
this.sender = abstractSender;
if (logger.isDebugEnabled()) {
logger.debug("{}: Contains {} elements", this, size());
}
-
-
}
public Region<Long, AsyncEvent> getRegion() {
@@ -399,7 +395,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
boolean wasEmpty = this.lastDispatchedKey == this.lastDestroyedKey;
this.lastDispatchedKey = key;
if (wasEmpty) {
- this.notify();
+ notifyAll();
}
if (logger.isDebugEnabled()) {
@@ -425,7 +421,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
}
public Object peek() throws CacheException {
- // resetLastPeeked();
Object object = peekAhead();
if (logger.isTraceEnabled()) {
logger.trace("{}: Peeked {} -> {}", this, peekedIds, object);
@@ -451,7 +446,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
}
List<AsyncEvent> batch = new ArrayList<AsyncEvent>(size * 2); // why
// *2?
- // resetLastPeeked();
while (batch.size() < size) {
AsyncEvent object = peekAhead();
// Conflate here
@@ -682,7 +676,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
/**
* Clear the list of peeked keys. The next peek will start again at the head key.
- *
*/
public void resetLastPeeked() {
this.peekedIds.clear();
@@ -693,7 +686,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
*
* @throws CacheException
*/
-
private Long getCurrentKey() {
long currentKey;
if (this.peekedIds.isEmpty()) {
@@ -732,7 +724,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
return null;
}
-
// It's important here that we check where the current key
// is in relation to the tail key before we check to see if the
// object exists. The reason is that the tail key is basically
@@ -742,7 +733,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
// If we check for the object, and then check the tail key, we could
// skip objects.
- // @todo don't do a get which updates the lru, instead just get the value
+ // TODO: don't do a get which updates the lru, instead just get the value
// w/o modifying the LRU.
// Note: getting the serialized form here (if it has overflowed to disk)
// does not save anything since GatewayBatchOp needs to GatewayEventImpl
@@ -1022,12 +1013,14 @@ public class SerialGatewaySenderQueue implements RegionQueue {
*/
private volatile boolean shutdown = false;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
/**
* Constructor : Creates and initializes the thread
+ *
+ * @param c
*/
- public BatchRemovalThread(GemFireCacheImpl c) {
+ public BatchRemovalThread(InternalCache c) {
this.setDaemon(true);
this.cache = c;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index 12a71a6..4cc75aa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -1137,6 +1137,36 @@ public class CacheCreation implements InternalCache {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
+ @Override
+ public InternalLogWriter getInternalLogWriter() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public InternalLogWriter getSecurityInternalLogWriter() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public Set<LocalRegion> getApplicationRegions() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public void removeGatewaySender(final GatewaySender sender) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public DistributedLockService getGatewaySenderLockService() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public Properties getDeclarableProperties(final Declarable declarable) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
public void addGatewayReceiver(GatewayReceiver receiver) {
this.gatewayReceivers.add(receiver);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
index 21431a0..0cee768 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.cache.xmlcache;
+import static javax.xml.XMLConstants.*;
import static org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils.*;
import static org.apache.geode.management.internal.configuration.utils.XmlConstants.*;
-import static javax.xml.XMLConstants.*;
import java.io.File;
import java.io.FileWriter;
@@ -42,7 +42,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.geode.cache.wan.*;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
@@ -93,6 +92,7 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.client.internal.InternalClientCache;
import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
@@ -103,6 +103,11 @@ import org.apache.geode.cache.query.internal.index.PrimaryKeyIndex;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.cache.util.ObjectSizer;
+import org.apache.geode.cache.wan.GatewayEventFilter;
+import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter;
+import org.apache.geode.cache.wan.GatewayReceiver;
+import org.apache.geode.cache.wan.GatewaySender;
+import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.Role;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.AbstractRegion;
@@ -111,6 +116,7 @@ import org.apache.geode.internal.cache.ClientSubscriptionConfigImpl;
import org.apache.geode.internal.cache.ColocationHelper;
import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionAttributesImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -127,7 +133,6 @@ import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
* developed for testing purposes, but it is conceivable that it could be used in the product as
* well.
*
- *
* @since GemFire 3.0
*/
@SuppressWarnings("deprecation")
@@ -139,8 +144,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
/** The content handler to which SAX events are generated */
private ContentHandler handler;
- ///////////////////////// Instance Fields ////////////////////////
-
/** The Cache that we're generating XML for */
final private Cache cache;
@@ -151,18 +154,9 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
private boolean includeKeysValues = true;
private final boolean generateDefaults;
- // final private int cacheLockLease;
- // final private int cacheLockTimeout;
- // final private int cacheSearchTimeout;
- // final private boolean isServer;
- // final private boolean copyOnRead;
-
/** The <code>CacheCreation</code> from which XML is generated */
private final CacheCreation creation;
- /////////////////////// Static Methods ///////////////////////
-
-
/**
* Examines the given <code>Cache</code> and from it generates XML data that is written to the
* given <code>PrintWriter</code>. The schema/dtd for the current version of GemFire is used.
@@ -280,9 +274,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
(new CacheXmlGenerator()).generate(pw);
}
-
- //////////////////////// Constructors ////////////////////////
-
/**
* Creates a new <code>CacheXmlGenerator</code> that generates XML for a given <code>Cache</code>.
*/
@@ -304,7 +295,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
this.creation.startingGenerate();
} else if (cache instanceof GemFireCacheImpl) {
- if (((GemFireCacheImpl) cache).isClient()) {
+ if (((InternalCache) cache).isClient()) {
this.creation = new ClientCacheCreation();
if (generateDefaults() || cache.getCopyOnRead()) {
this.creation.setCopyOnRead(cache.getCopyOnRead());
@@ -402,8 +393,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
creation.setCopyOnRead(GemFireCacheImpl.DEFAULT_COPY_ON_READ);
}
- ////////////////////// Instance Methods //////////////////////
-
/**
* Writes the generator's state to pw
*/
@@ -563,7 +552,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
if (this.cache instanceof GemFireCacheImpl) {
- GemFireCacheImpl gfc = (GemFireCacheImpl) this.cache;
+ InternalCache gfc = (InternalCache) this.cache;
for (DiskStore ds : gfc.listDiskStores()) {
generate(ds);
}
@@ -587,7 +576,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
// we need to exclude them in all versions.
// It would be better if CacheCreation could only predefine them
// for versions 6.5 and later but that is not easy to do
- /* if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) */ {
+ {
if (this.creation instanceof ClientCacheCreation) {
try {
ClientRegionShortcut.valueOf(id);
@@ -632,8 +621,8 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
if (!isClientCache) {
if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) >= 0) {
if (this.cache instanceof GemFireCacheImpl) {
- GemFireCacheImpl gfc = (GemFireCacheImpl) this.cache;
- for (File file : gfc.getBackupFiles()) {
+ InternalCache internalCache = (InternalCache) this.cache;
+ for (File file : internalCache.getBackupFiles()) {
generateBackupFile(file);
}
} else {
@@ -646,12 +635,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_6) >= 0) {
generateInitializer();
}
- } else {
- if (handler instanceof LexicalHandler) {
- // LexicalHandler lex = (LexicalHandler) handler;
- // lex.comment(comment.toCharArray(), 0, comment.length());
- }
-
}
if (cache instanceof Extensible) {
@@ -670,12 +653,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
private void generatePdx() throws SAXException {
AttributesImpl atts = new AttributesImpl();
- CacheConfig config;
- if (this.cache instanceof CacheCreation) {
- config = ((CacheCreation) cache).getCacheConfig();
- } else {
- config = ((GemFireCacheImpl) cache).getCacheConfig();
- }
+ CacheConfig config = ((InternalCache) cache).getCacheConfig();
if (config.pdxReadSerializedUserSet) {
if (generateDefaults() || this.cache.getPdxReadSerialized())
atts.addAttribute("", "", READ_SERIALIZED, "",
@@ -929,7 +907,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
*
* @since GemFire 5.7
*/
-
private void generateClientHaQueue(CacheServer bridge) throws SAXException {
AttributesImpl atts = new AttributesImpl();
ClientSubscriptionConfigImpl csc =
@@ -1006,11 +983,10 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
String.valueOf(bridge.getMaximumMessageCount()));
if (generateDefaults()
- || bridge.getMessageTimeToLive() != CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE)
+ || bridge.getMessageTimeToLive() != CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE) {
atts.addAttribute("", "", MESSAGE_TIME_TO_LIVE, "",
String.valueOf(bridge.getMessageTimeToLive()));
-
-
+ }
if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) < 0) {
return;
@@ -1063,8 +1039,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
if (generateDefaults() || !probe.equals(CacheServer.DEFAULT_LOAD_PROBE)) {
generate(LOAD_PROBE, probe);
}
-
-
}
if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) >= 0) {
handler.endElement("", "", CACHE_SERVER);
@@ -1184,8 +1158,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
/**
* Compare regions by name
- *
- *
*/
class RegionComparator implements Comparator {
public int compare(Object o1, Object o2) {
@@ -1197,7 +1169,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
}
-
/**
* Generates XML for the given connection pool
*
@@ -1598,7 +1569,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
private void generateGatewayEventFilter(GatewayEventFilter gef) throws SAXException {
-
handler.startElement("", GATEWAY_EVENT_FILTER, GATEWAY_EVENT_FILTER, EMPTY);
String className = gef.getClass().getName();
@@ -1614,7 +1584,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
private void generateGatewayTransportFilter(GatewayTransportFilter gef) throws SAXException {
-
handler.startElement("", GATEWAY_TRANSPORT_FILTER, GATEWAY_TRANSPORT_FILTER, EMPTY);
String className = gef.getClass().getName();
@@ -1646,24 +1615,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
handler.endElement("", GATEWAY_EVENT_SUBSTITUTION_FILTER, GATEWAY_EVENT_SUBSTITUTION_FILTER);
}
- //
- // private void generateGatewayEventListener(GatewayEventListener gef)
- // throws SAXException {
- //
- // handler.startElement("", GATEWAY_EVENT_LISTENER, GATEWAY_EVENT_LISTENER,
- // EMPTY);
- // String className = gef.getClass().getName();
- //
- // handler.startElement("", CLASS_NAME, CLASS_NAME, EMPTY);
- // handler.characters(className.toCharArray(), 0, className.length());
- // handler.endElement("", CLASS_NAME, CLASS_NAME);
- // Properties props = null;
- // if (gef instanceof Declarable2) {
- // props = ((Declarable2)gef).getConfig();
- // generate(props, null);
- // }
- // handler.endElement("", GATEWAY_EVENT_LISTENER, GATEWAY_EVENT_LISTENER);
- // }
/**
* Generates XML for a given region
@@ -1996,8 +1947,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
}
-
-
if ((!(attrs instanceof RegionAttributesCreation)
|| ((RegionAttributesCreation) attrs).hasStatisticsEnabled())) {
if (generateDefaults() || attrs.getStatisticsEnabled())
@@ -2230,7 +2179,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
* Generates XML for a <code>CacheCallback</code>
*/
private void generate(String kind, Object callback) throws SAXException {
-
if (callback == null) {
return;
}
@@ -2248,7 +2196,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
} else if (callback instanceof ReflectionBasedAutoSerializer) {
props = ((ReflectionBasedAutoSerializer) callback).getConfig();
} else if (callback instanceof Declarable && cache instanceof GemFireCacheImpl) {
- props = ((GemFireCacheImpl) cache).getDeclarableProperties((Declarable) callback);
+ props = ((InternalCache) cache).getDeclarableProperties((Declarable) callback);
}
generate(props, null);
@@ -2256,7 +2204,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
private void generate(String kind, Declarable d, Properties p) throws SAXException {
-
if (d == null) {
return;
}
@@ -2274,7 +2221,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
private void generate(EvictionAttributes ea) throws SAXException {
-
EvictionAction eAction = ea.getAction();
if (eAction.isNone()) {
return;
@@ -2366,7 +2312,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
* Generates XML for <code>SubscriptionAttributes</code>
*/
private void generate(SubscriptionAttributes attrs) throws SAXException {
-
if (attrs == null) {
return;
}
@@ -2394,7 +2339,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
* Generates XML for a <code>PartitionAttributes</code>
*/
private void generate(PartitionAttributes pa) throws SAXException {
-
AttributesImpl atts = new AttributesImpl();
if (generateDefaults() || pa.getRedundantCopies() != 0)
@@ -2530,7 +2474,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
}
-
/**
* Generates XML for a <code>DiskWriteAttributes</code>
*/
@@ -2631,29 +2574,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
if (d instanceof Declarable2) {
Properties props = ((Declarable2) d).getConfig();
generate(props, null);
- // for (Iterator iter = props.entrySet().iterator();
- // iter.hasNext(); ) {
- // Map.Entry entry = (Map.Entry) iter.next();
- // String name = (String) entry.getKey();
- // Object value = entry.getValue();
- //
- // AttributesImpl atts = new AttributesImpl();
- // atts.addAttribute("", "", NAME, "", name);
- //
- // handler.startElement("", PARAMETER, PARAMETER, atts);
- //
- // if (value instanceof String) {
- // generate((String) value);
- //
- // } else if (value instanceof Declarable) {
- // generate((Declarable) value);
- //
- // } else {
- // // Ignore it
- // }
- //
- // handler.endElement("", PARAMETER, PARAMETER);
- // }
}
if (includeDeclarable) {
@@ -2705,7 +2625,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
}
-
private void generate(final Properties props, String elementName) throws SAXException {
if (props == null || props.isEmpty()) {
return;
@@ -2762,8 +2681,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
return this;
}
- ////////// Inherited methods that don't do anything //////////
-
public boolean getFeature(String name)
throws SAXNotRecognizedException, SAXNotSupportedException {
return false;
@@ -2771,7 +2688,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
public void setFeature(String name, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException {
-
+ // nothing
}
public Object getProperty(String name)
@@ -2782,11 +2699,11 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
-
+ // nothing
}
public void setEntityResolver(EntityResolver resolver) {
-
+ // nothing
}
public EntityResolver getEntityResolver() {
@@ -2794,7 +2711,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
public void setDTDHandler(DTDHandler handler) {
-
+ // nothing
}
public DTDHandler getDTDHandler() {
@@ -2802,14 +2719,13 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
}
public void setErrorHandler(ErrorHandler handler) {
-
+ // nothing
}
public void parse(String systemId) throws IOException, SAXException {
-
+ // nothing
}
-
/**
* Used by gemfire build.xml to generate a default gemfire.properties for use by applications. See
* bug 30995 for the feature request.
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index fd8fb2a..c8635d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -108,7 +108,7 @@ import org.apache.geode.internal.cache.DiskStoreAttributes;
import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionAttributesImpl;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.lru.LRUCapacityController;
@@ -332,8 +332,9 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
* @throws TimeoutException
* @throws CacheWriterException
* @throws RegionExistsException
+ * @param cache
*/
- public void create(GemFireCacheImpl cache)
+ public void create(InternalCache cache)
throws TimeoutException, GatewayException, CacheWriterException, RegionExistsException {
if (this.cache == null) {
String s = "A cache or client-cache element is required";
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
index 30b6237..cf8c4c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -41,6 +41,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.SubscriptionAttributes;
+import org.apache.geode.cache.client.internal.InternalClientCache;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.cache.EvictionAttributesImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -62,8 +63,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
private static final RegionAttributes defaultAttributes = new AttributesFactory().create();
- /////////////////////// Instance Fields ///////////////////////
-
/** The attributes' cache listener */
private ArrayList cacheListeners;
/** The attributes' gateway senders */
@@ -288,8 +287,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
}
}
- ////////////////////// Instance Methods //////////////////////
-
/**
* Returns whether or not two objects are {@linkplain Object#equals equals} taking
* <code>null</code> into account.
@@ -386,14 +383,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
* <code>RegionAttributes</code>.
*/
public boolean sameAs(RegionAttributes other) {
- // if (!equal(this.cacheListeners, Arrays.asList(other.getCacheListeners()))) {
- // throw new RuntimeException("cacheListeners not equal "
- // + this.cacheListeners
- // + " and "
- // + Arrays.asList(other.getCacheListeners())
- // + " this=" + this
- // + " other=" + other);
- // }
if (!equal(this.cacheListeners, Arrays.asList(other.getCacheListeners()))) {
throw new RuntimeException(
LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
@@ -895,7 +884,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
setHasMulticastEnabled(true);
}
- /*
+ /**
* @deprecated as of prPersistSprint1
*/
@Deprecated
@@ -903,13 +892,12 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
return this.publisher;
}
- /*
+ /**
* @deprecated as of prPersistSprint1
*/
@Deprecated
public void setPublisher(boolean v) {
- // this.publisher = v;
- // setHasPublisher(true);
+ // nothing
}
public boolean getEnableConflation() { // deprecated in 5.0
@@ -958,11 +946,10 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated as of prPersistSprint2
*/
+ @Deprecated
public void setDiskWriteAttributes(DiskWriteAttributes attrs) {
// not throw exception for mixed API, since it's internal
this.diskWriteAttributes = attrs;
- // Asif: Take the value of isSynchronous from it;
- // Asif : Is this correct?
this.isDiskSynchronous = attrs.isSynchronous();
setHasDiskWriteAttributes(true);
}
@@ -970,6 +957,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated as of prPersistSprint2
*/
+ @Deprecated
public File[] getDiskDirs() {
// not throw exception for mixed API, since it's internal
return this.diskDirs;
@@ -978,6 +966,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated as of prPersistSprint2
*/
+ @Deprecated
public int[] getDiskDirSizes() {
// not throw exception for mixed API, since it's internal
return this.diskSizes;
@@ -986,6 +975,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated as of prPersistSprint2
*/
+ @Deprecated
public void setDiskDirs(File[] diskDirs) {
// not throw exception for mixed API, since it's internal
checkIfDirectoriesExist(diskDirs);
@@ -1008,12 +998,8 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
public boolean isDiskSynchronous() {
return this.isDiskSynchronous;
- // Asif: If DiskWriteAttributes is set, the flag needs to be checked from DiskWriteAttribs
+ // If DiskWriteAttributes is set, the flag needs to be checked from DiskWriteAttribs
// TODO: Should we set the correct value in the flag isDiskSynchronous
- /*
- * if(hasDiskWriteAttributes()) { return this.diskWriteAttributes.isSynchronous(); }else {
- * return this.isDiskSynchronous; }
- */
}
public void setDiskSynchronous(boolean isDiskSynchronous) {
@@ -1036,10 +1022,10 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
}
}
-
/**
* @deprecated as of prPersistSprint2
*/
+ @Deprecated
public void setDiskDirsAndSize(File[] diskDirs, int[] sizes) {
// not throw exception for mixed API, since it's internal
checkIfDirectoriesExist(diskDirs);
@@ -1055,7 +1041,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
this.setHasDiskDirs(true);
}
-
private void verifyNonNegativeDirSize(int[] sizes) {
for (int i = 0; i < sizes.length; i++) {
if (sizes[i] < 0) {
@@ -1126,7 +1111,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
if (setDefaultPool && this.requiresPoolName && !hasPoolName()) {
String defaultPoolName = null;
if (cache instanceof GemFireCacheImpl) {
- GemFireCacheImpl gfc = (GemFireCacheImpl) cache;
+ InternalClientCache gfc = (InternalClientCache) cache;
if (gfc.getDefaultPool() != null) {
defaultPoolName = gfc.getDefaultPool().getName();
}
@@ -1162,7 +1147,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
if (!hasPoolName()) {
String defaultPoolName = null;
if (cache instanceof GemFireCacheImpl) {
- GemFireCacheImpl gfc = (GemFireCacheImpl) cache;
+ InternalClientCache gfc = (InternalClientCache) cache;
if (gfc.getDefaultPool() != null) {
defaultPoolName = gfc.getDefaultPool().getName();
}
@@ -1547,7 +1532,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
setMulticastEnabled(parent.getMulticastEnabled());
}
}
-
}
public PartitionAttributes getPartitionAttributes() {
@@ -1569,6 +1553,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated this API is scheduled to be removed
*/
+ @Deprecated
public MembershipAttributes getMembershipAttributes() {
return this.membershipAttributes;
}
@@ -1576,6 +1561,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
/**
* @deprecated this API is scheduled to be removed
*/
+ @Deprecated
public void setMembershipAttributes(MembershipAttributes pa) {
this.membershipAttributes = pa;
setHasMembershipAttributes(true);
@@ -1656,7 +1642,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
&& (getRegionTimeToLive().getTimeout() != 0 || getRegionIdleTimeout().getTimeout() != 0
|| getEntryTimeToLive().getTimeout() != 0 || getEntryIdleTimeout().getTimeout() != 0
|| getCustomEntryIdleTimeout() != null || getCustomEntryTimeToLive() != null)) {
- // @todo we could do some more implementation work so that we would
+ // TODO: we could do some more implementation work so that we would
// not need to enable stats unless entryIdleTimeout is enabled.
// We need the stats in that case because we need a new type of RegionEntry
// so we know that last time it was accessed. But for all the others we
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
index 9e18a3a..a107fb3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
@@ -46,7 +46,6 @@ import org.apache.geode.cache.TimeoutException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.index.IndexCreationData;
import org.apache.geode.cache.snapshot.RegionSnapshotService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.extension.Extensible;
@@ -59,18 +58,10 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* {@link Region} interface so that this class must be updated when {@link Region} is modified. This
* class is public for testing purposes.
*
- *
* @since GemFire 3.0
*/
public class RegionCreation implements Region, Extensible<Region<?, ?>> {
- // /** An <code>AttributesFactory</code> for creating default
- // * <code>RegionAttribute</code>s */
- // private static final AttributesFactory defaultFactory =
- // new AttributesFactory();
-
- /////////////////////// Instance Fields ///////////////////////
-
/** The name of this region */
private final String name;
@@ -116,8 +107,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
private final SimpleExtensionPoint<Region<?, ?>> extensionPoint =
new SimpleExtensionPoint<Region<?, ?>>(this, this);
- /////////////////////// Constructors ///////////////////////
-
/**
* Creates a new <code>RegionCreation</code> with the given name and with the default
* <code>RegionAttributes</code>.
@@ -147,8 +136,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
this(cache, null, name, null);
}
- ////////////////////// Instance Methods //////////////////////
-
public Object put(Object key, Object value) throws TimeoutException, CacheWriterException {
return this.values.put(key, value);
}
@@ -636,8 +623,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
return this.fullPath;
}
- ////////// Inherited methods that don't do anything //////////
-
public Region getParentRegion() {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
@@ -666,7 +651,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
-
public void destroyRegion() throws CacheWriterException, TimeoutException {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
@@ -737,7 +721,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
-
public Object destroy(Object key)
throws TimeoutException, EntryNotFoundException, CacheWriterException {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
@@ -754,7 +737,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
public void localDestroy(Object key, Object callbackArgument) throws EntryNotFoundException {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
-
}
public Set keys() {
@@ -832,7 +814,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
public void clear() {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
-
}
public boolean isEmpty() {
@@ -900,39 +881,18 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
throw new UnsupportedOperationException("Shouldn't be invoked");
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.concurrent.ConcurrentMap#putIfAbsent(java.lang.Object, java.lang.Object)
- */
public Object putIfAbsent(Object key, Object value) {
throw new UnsupportedOperationException();
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.concurrent.ConcurrentMap#remove(java.lang.Object, java.lang.Object)
- */
public boolean remove(Object key, Object value) {
throw new UnsupportedOperationException();
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object)
- */
public Object replace(Object key, Object value) {
throw new UnsupportedOperationException();
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.concurrent.ConcurrentMap#replace(java.lang.Object, java.lang.Object,
- * java.lang.Object)
- */
public boolean replace(Object key, Object oldValue, Object newValue) {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 08ee355..3c9dd72 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
@@ -27,6 +27,7 @@ import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
@@ -200,7 +201,7 @@ public class DataType implements DSCODE {
case PDX: {
int typeId = in.readInt();
try {
- GemFireCacheImpl gfc = GemFireCacheImpl
+ InternalCache gfc = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
PdxType pdxType = gfc.getPdxRegistry().getType(typeId);
if (pdxType == null) { // fix 52164
@@ -216,7 +217,7 @@ public class DataType implements DSCODE {
int tmp = InternalDataSerializer.readArrayLength(in);
int enumId = (dsId << 24) | (tmp & 0xFFFFFF);
try {
- GemFireCacheImpl gfc = GemFireCacheImpl
+ InternalCache gfc = GemFireCacheImpl
.getForPdx("PDX registry is unavailable because the Cache has been closed.");
EnumInfo enumInfo = gfc.getPdxRegistry().getEnumInfoById(enumId);
return "PdxRegistry/java.lang.Enum:" + enumInfo.getClassName();
@@ -244,10 +245,8 @@ public class DataType implements DSCODE {
}
return "Unknown header byte: " + header;
} catch (IOException e) {
- // return "IOException for header byte: " + header;
throw new Error(e);
} catch (ClassNotFoundException e) {
- // return "IOException for header byte: " + header;
throw new Error(e);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
index 4dd152e..f057369 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
@@ -14,18 +14,31 @@
*/
package org.apache.geode.internal.offheap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionService;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionDataStore;
+import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.offheap.annotations.OffHeapIdentifier;
import org.apache.geode.internal.offheap.annotations.Unretained;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* This allocator is somewhat like an Arena allocator. We start out with an array of multiple large
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisee.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisee.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisee.java
index 5952c4c..7d02d38 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisee.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisee.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.management.internal;
+import java.net.UnknownHostException;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
@@ -22,26 +24,23 @@ import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.admin.SSLConfig;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+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.security.SecurableCommunicationChannel;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
-import java.net.UnknownHostException;
-
/**
- *
* @since GemFire 7.0
*/
public class JmxManagerAdvisee implements DistributionAdvisee {
private final int serialNumber;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
private JmxManagerProfile myMostRecentProfile;
- public JmxManagerAdvisee(GemFireCacheImpl cache) {
+ public JmxManagerAdvisee(InternalCache cache) {
this.serialNumber = DistributionAdvisor.createSerialNumber();
this.cache = cache;
}
@@ -73,7 +72,7 @@ public class JmxManagerAdvisee implements DistributionAdvisee {
@Override
public InternalDistributedSystem getSystem() {
- return this.cache.getSystem();
+ return this.cache.getInternalDistributedSystem();
}
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
index a0f63ce..c8858f4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/JmxManagerAdvisor.java
@@ -35,12 +35,12 @@ import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
* @since GemFire 7.0
*/
public class JmxManagerAdvisor extends DistributionAdvisor {
@@ -104,10 +104,10 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
return new JmxManagerProfile(memberId, version);
}
- @Override
/**
* Overridden to also include our profile. If our profile is included it will always be first.
*/
+ @Override
protected List/* <Profile> */ fetchProfiles(Filter f) {
initializationGate();
List result = null;
@@ -169,18 +169,12 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
this.profile = p;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.
- * distributed.internal.DistributionManager)
- */
@Override
protected void process(DistributionManager dm) {
Throwable thr = null;
JmxManagerProfile p = null;
try {
- final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ final InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
final JmxManagerAdvisor adv = cache.getJmxManagerAdvisor();
p = this.profile;
@@ -194,7 +188,7 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
}
} catch (CancelException e) {
if (logger.isDebugEnabled()) {
- logger.debug("Cache closed, ", this);
+ logger.debug("Cache closed, {}", this);
}
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
@@ -219,11 +213,6 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
- */
public int getDSFID() {
return JMX_MANAGER_PROFILE_MESSAGE;
}
@@ -338,7 +327,7 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
@Override
public void processIncoming(DistributionManager dm, String adviseePath, boolean removeProfile,
boolean exchangeProfiles, final List<Profile> replyProfiles) {
- final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ final InternalCache cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
handleDistributionAdvisee(cache.getJmxManagerAdvisor().getAdvisee(), removeProfile,
exchangeProfiles, replyProfiles);
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 9394efb..62310e8 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,32 +14,6 @@
*/
package org.apache.geode.management.internal;
-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.GemFireCacheImpl;
-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;
-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;
@@ -55,6 +29,7 @@ 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;
@@ -68,6 +43,33 @@ 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.
@@ -118,11 +120,11 @@ public class ManagementAgent {
this.isHttpServiceRunning = isHttpServiceRunning;
}
- private boolean isAPIRestServiceRunning(GemFireCacheImpl cache) {
+ private boolean isAPIRestServiceRunning(InternalCache cache) {
return (cache != null && cache.getRestAgent() != null && cache.getRestAgent().isRunning());
}
- private boolean isServerNode(GemFireCacheImpl cache) {
+ private boolean isServerNode(InternalCache cache) {
return (cache.getInternalDistributedSystem().getDistributedMember()
.getVmKind() != DistributionManager.LOCATOR_DM_TYPE
&& cache.getInternalDistributedSystem().getDistributedMember()
@@ -130,7 +132,7 @@ public class ManagementAgent {
&& !cache.isClient());
}
- public synchronized void startAgent(GemFireCacheImpl cache) {
+ public synchronized void startAgent(InternalCache cache) {
// Do not start Management REST service if developer REST service is already
// started.
@@ -285,7 +287,7 @@ public class ManagementAgent {
// set cache property for developer REST service running
if (isRestWebAppAdded) {
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
cache.setRESTServiceRunning(true);
// create region to hold query information (queryId, queryString).
@@ -354,12 +356,9 @@ public class ManagementAgent {
* https://blogs.oracle.com/jmxetc/entry/java_5_premain_rmi_connectors
* https://blogs.oracle.com/jmxetc/entry/building_a_remotely_stoppable_connector
* https://blogs.oracle.com/jmxetc/entry/jmx_connecting_through_firewalls_using
+ * https://blogs.oracle.com/jmxetc/entry/java_5_premain_rmi_connectors
*/
private void configureAndStart() throws IOException {
- // KIRK: I copied this from
- // https://blogs.oracle.com/jmxetc/entry/java_5_premain_rmi_connectors
- // we'll need to change this significantly but it's a starting point
-
// get the port for RMI Registry and RMI Connector Server
final int port = this.config.getJmxManagerPort();
final String hostname;
@@ -387,7 +386,6 @@ public class ManagementAgent {
(bindAddr != null ? (" bound to " + bindAddr) : "") + (ssl ? " using SSL" : ""));
}
RMIClientSocketFactory rmiClientSocketFactory = ssl ? new SslRMIClientSocketFactory() : null;// RMISocketFactory.getDefaultSocketFactory();
- // new GemFireRMIClientSocketFactory(sc, getLogger());
RMIServerSocketFactory rmiServerSocketFactory =
new GemFireRMIServerSocketFactory(socketCreator, bindAddr);
@@ -399,14 +397,14 @@ public class ManagementAgent {
// everywhere, or nowhere. Since we want to use them in the JMX
// RMI Connector server, we must also use them in the RMI Registry.
// Otherwise, we wouldn't be able to use a single port.
- //
+
// Start an RMI registry on port <port>.
registry = LocateRegistry.createRegistry(port, rmiClientSocketFactory, rmiServerSocketFactory);
// Retrieve the PlatformMBeanServer.
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- // Environment map. KIRK: why is this declared as HashMap?
+ // Environment map. why is this declared as HashMap?
final HashMap<String, Object> env = new HashMap<String, Object>();
// Manually creates and binds a JMX RMI Connector Server stub with the
@@ -441,7 +439,7 @@ public class ManagementAgent {
// Create an RMI connector server with the JMXServiceURL
//
- // KIRK: JDK 1.5 cannot use JMXConnectorServerFactory because of
+ // JDK 1.5 cannot use JMXConnectorServerFactory because of
// http://bugs.sun.com/view_bug.do?bug_id=5107423
// but we're using JDK 1.6
jmxConnectorServer =
@@ -538,8 +536,6 @@ public class ManagementAgent {
}
}
- ;
-
private static class GemFireRMIServerSocketFactory
implements RMIServerSocketFactory, Serializable {
@@ -557,6 +553,4 @@ public class ManagementAgent {
return this.sc.createServerSocket(port, TCPConduit.getBackLog(), this.bindAddr);
}
}
-
- ;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
index 26f4d38..097b161 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
@@ -29,6 +29,7 @@ import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
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.logging.LogService;
/**
@@ -40,17 +41,11 @@ import org.apache.geode.internal.logging.LogService;
*
* 1) All setter methods 2) All operations 3) addNotificationListener 4) removeNotificationListener
* 5) getNotificationInfo
- *
- *
*/
-
public class ManagementFunction extends FunctionAdapter implements InternalEntity {
private static final Logger logger = LogService.getLogger();
- /**
- *
- */
private static final long serialVersionUID = 1L;
/**
@@ -81,8 +76,7 @@ public class ManagementFunction extends FunctionAdapter implements InternalEntit
boolean executedSuccessfully = false;
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
-
+ InternalCache cache = GemFireCacheImpl.getInstance();
Object[] functionArguments = (Object[]) fc.getArguments();
@@ -145,10 +139,8 @@ public class ManagementFunction extends FunctionAdapter implements InternalEntit
sendException(e, fc);
return; // member is closing or invalid member
}
-
}
}
-
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/geode-core/src/main/java/org/apache/geode/management/internal/Manager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/Manager.java b/geode-core/src/main/java/org/apache/geode/management/internal/Manager.java
index 3c80969..916cbd7 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/Manager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/Manager.java
@@ -14,10 +14,8 @@
*/
package org.apache.geode.management.internal;
-import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.cache.InternalCache;
/**
* The Manager is a 7.0 JMX Agent which is hosted within a GemFire process. Only one instance is
@@ -28,44 +26,32 @@ import org.apache.geode.internal.logging.InternalLogWriter;
*/
public abstract class Manager {
-
- /**
- * GemFire Cache implementation
- */
-
- protected GemFireCacheImpl cache;
-
+ protected InternalCache cache;
/**
* depicts whether this node is a Managing node or not
*/
protected volatile boolean running = false;
-
/**
* depicts whether this node is a Managing node or not
*/
protected volatile boolean stopCacheOps = false;
-
-
/**
* This is a single window to manipulate region resources for management
*/
protected ManagementResourceRepo repo;
-
/**
* The concrete implementation of DistributedSystem that provides internal-only functionality.
*/
-
protected InternalDistributedSystem system;
-
-
- public Manager(ManagementResourceRepo repo, InternalDistributedSystem system, Cache cache) {
+ public Manager(ManagementResourceRepo repo, InternalDistributedSystem system,
+ InternalCache cache) {
this.repo = repo;
- this.cache = (GemFireCacheImpl) cache;
+ this.cache = cache;
this.system = system;
}
@@ -77,12 +63,8 @@ public abstract class Manager {
/**
* For internal use only
- *
*/
-
public ManagementResourceRepo getManagementResourceRepo() {
return repo;
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/bccdb56e/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 07e6e25..837e815 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
@@ -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;
import java.net.UnknownHostException;
@@ -29,9 +28,9 @@ import org.apache.geode.cache.RegionAttributes;
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.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
@@ -60,15 +59,14 @@ public class RestAgent {
return this.running;
}
- private boolean isManagementRestServiceRunning(GemFireCacheImpl cache) {
+ private boolean isManagementRestServiceRunning(InternalCache cache) {
final SystemManagementService managementService =
(SystemManagementService) ManagementService.getManagementService(cache);
return (managementService.getManagementAgent() != null
&& managementService.getManagementAgent().isHttpServiceRunning());
-
}
- public synchronized void start(GemFireCacheImpl cache) {
+ public synchronized void start(InternalCache cache) {
if (!this.running && this.config.getHttpServicePort() != 0
&& !isManagementRestServiceRunning(cache)) {
try {
@@ -84,7 +82,6 @@ public class RestAgent {
logger.debug(e.getMessage(), e);
}
}
-
}
public synchronized void stop() {
@@ -141,7 +138,7 @@ public class RestAgent {
this.httpServer = JettyHelper.addWebApplication(httpServer, "/geode", gemfireAPIWar);
if (logger.isDebugEnabled()) {
- logger.info("Starting HTTP embedded server on port ({}) at bind-address ({})...",
+ logger.debug("Starting HTTP embedded server on port ({}) at bind-address ({})...",
((ServerConnector) this.httpServer.getConnectors()[0]).getPort(),
httpServiceBindAddress);
}
@@ -212,9 +209,8 @@ public class RestAgent {
if (logger.isDebugEnabled()) {
logger.debug("Starting creation of __ParameterizedQueries__ region");
}
- GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
if (cache != null) {
- // cache.getCacheConfig().setPdxReadSerialized(true);
final InternalRegionArguments regionArguments = new InternalRegionArguments();
regionArguments.setIsUsedForMetaRegion(true);
final AttributesFactory<String, String> attributesFactory =