You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/11/05 22:55:48 UTC
[geode] branch develop updated: GEODE-5980: Removed unused
collections. (#2774)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 6f303b3 GEODE-5980: Removed unused collections. (#2774)
6f303b3 is described below
commit 6f303b30bcd1b97e08415917b7720a0fc1c4ce90
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Mon Nov 5 14:55:39 2018 -0800
GEODE-5980: Removed unused collections. (#2774)
* Removed collections that are populated but are never used.
---
.../membership/gms/mgr/GMSMembershipManager.java | 1 +
.../geode/internal/cache/CacheServerLauncher.java | 82 ++++++----------------
.../cache/PartitionedRegionQueryEvaluator.java | 3 -
.../experimental/driver/ProtobufQueryService.java | 1 +
.../geode/tools/pulse/internal/data/Cluster.java | 11 ---
5 files changed, 23 insertions(+), 75 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 9fc2cee..a80b211 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -2366,6 +2366,7 @@ public class GMSMembershipManager implements MembershipManager, Manager {
} else {
List<MembershipTestHook> l = new ArrayList<>(this.membershipTestHooks);
l.remove(mth);
+ this.membershipTestHooks = l;
}
}
} finally {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 8a66ebb..cc76800 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -28,7 +28,6 @@ import java.io.ObjectOutputStream;
import java.io.PrintStream;
import java.io.Serializable;
import java.net.URL;
-import java.util.AbstractList;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -1194,44 +1193,54 @@ public class CacheServerLauncher {
*/
protected void addToServerCommand(final List<String> commandLine,
final Map<String, Object> options) {
- final ListWrapper<String> commandLineWrapper = new ListWrapper<String>(commandLine);
if (Boolean.TRUE.equals(options.get(REBALANCE))) {
- commandLineWrapper.add("-rebalance");
+ commandLine.add("-rebalance");
}
- commandLineWrapper.add((String) options.get(DISABLE_DEFAULT_SERVER));
- commandLineWrapper.add((String) options.get(SERVER_PORT));
- commandLineWrapper.add((String) options.get(SERVER_BIND_ADDRESS_NAME));
+ String disableDefaultServer = (String) options.get(DISABLE_DEFAULT_SERVER);
+ if (disableDefaultServer != null) {
+ commandLine.add(disableDefaultServer);
+ }
+
+ String serverPort = (String) options.get(SERVER_PORT);
+ if (serverPort != null) {
+ commandLine.add(serverPort);
+ }
+
+ String serverBindAddressName = (String) options.get(SERVER_BIND_ADDRESS_NAME);
+ if (serverBindAddressName != null) {
+ commandLine.add(serverBindAddressName);
+ }
String criticalHeapThreshold = (String) options.get(CRITICAL_HEAP_PERCENTAGE);
if (criticalHeapThreshold != null) {
- commandLineWrapper.add(criticalHeapThreshold);
+ commandLine.add(criticalHeapThreshold);
}
String evictionHeapThreshold = (String) options.get(EVICTION_HEAP_PERCENTAGE);
if (evictionHeapThreshold != null) {
- commandLineWrapper.add(evictionHeapThreshold);
+ commandLine.add(evictionHeapThreshold);
}
String criticalOffHeapThreshold = (String) options.get(CRITICAL_OFF_HEAP_PERCENTAGE);
if (criticalOffHeapThreshold != null) {
- commandLineWrapper.add(criticalOffHeapThreshold);
+ commandLine.add(criticalOffHeapThreshold);
}
String evictionOffHeapThreshold = (String) options.get(EVICTION_OFF_HEAP_PERCENTAGE);
if (evictionOffHeapThreshold != null) {
- commandLineWrapper.add(evictionOffHeapThreshold);
+ commandLine.add(evictionOffHeapThreshold);
}
final Properties props = (Properties) options.get(PROPERTIES);
for (final Object key : props.keySet()) {
- commandLineWrapper.add(key + "=" + props.getProperty(key.toString()));
+ commandLine.add(key + "=" + props.getProperty(key.toString()));
}
if (props.getProperty(LOG_FILE) == null && CacheServerLauncher.isLoggingToStdOut()) {
// Do not allow the cache server to log to stdout; override the logger with
// #defaultLogFileName
- commandLineWrapper.add(LOG_FILE + "=" + defaultLogFileName);
+ commandLine.add(LOG_FILE + "=" + defaultLogFileName);
}
}
@@ -1249,56 +1258,7 @@ public class CacheServerLauncher {
*/
protected void stopAdditionalServices() throws Exception {}
- /**
- * A List implementation that disallows null values.
- *
- * @param <E> the Class type for the List elements.
- */
- protected static class ListWrapper<E> extends AbstractList<E> {
-
- private static final ThreadLocal<Boolean> addResult = new ThreadLocal<Boolean>();
-
- private final List<E> list;
-
- public ListWrapper(final List<E> list) {
- assert list != null : "The List cannot be null!";
- this.list = list;
- }
-
- @Override
- public boolean add(final E e) {
- final boolean localAddResult = super.add(e);
- return (localAddResult && addResult.get());
- }
- @Override
- public void add(final int index, final E element) {
- if (element != null) {
- list.add(index, element);
- }
- addResult.set(element != null);
- }
-
- @Override
- public E get(final int index) {
- return this.list.get(index);
- }
-
- @Override
- public E remove(final int index) {
- return list.remove(index);
- }
-
- @Override
- public E set(final int index, final E element) {
- return (element != null ? list.set(index, element) : list.get(index));
- }
-
- @Override
- public int size() {
- return list.size();
- }
- }
private class MainLogReporter extends Thread implements StartupStatusListener {
private String lastLogMessage;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
index 628fd7e..f584b99 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import org.apache.logging.log4j.Logger;
@@ -130,7 +129,6 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
private final ConcurrentMap<InternalDistributedMember, Collection<Collection>> resultsPerMember;
private ConcurrentLinkedQueue<PRQueryTraceInfo> prQueryTraceInfoList = null;
private final Set<Integer> bucketsToQuery;
- private final IntOpenHashSet successfulBuckets;
// set of members failed to execute query
private Set<InternalDistributedMember> failedMembers;
@@ -152,7 +150,6 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
this.parameters = parameters;
this.cumulativeResults = cumulativeResults;
this.bucketsToQuery = bucketsToQuery;
- this.successfulBuckets = new IntOpenHashSet(this.bucketsToQuery.size());
this.resultsPerMember =
new ConcurrentHashMap<InternalDistributedMember, Collection<Collection>>();
this.node2bucketIds = Collections.emptyMap();
diff --git a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufQueryService.java b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufQueryService.java
index 62f8b3c..fc33d7f 100644
--- a/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufQueryService.java
+++ b/geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/ProtobufQueryService.java
@@ -88,6 +88,7 @@ class ProtobufQueryService implements QueryService {
for (int i = 0; i < decodedRow.size(); i++) {
rowMap.put(fieldNames.get(i), decodedRow.get(i));
}
+ results.add(rowMap);
}
return results;
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
index c531b1d..15f8f8d 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java
@@ -35,7 +35,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.management.remote.JMXConnector;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.collections.buffer.CircularFifoBuffer;
@@ -138,18 +137,8 @@ public class Cluster extends Thread {
// used for updating member's client data
public static long LAST_UPDATE_TIME = 0;
- public int getStaleStatus() {
- return this.stale;
- }
-
private boolean stopUpdates = false;
- private static final int MAX_HOSTS = 40;
-
- private final List<String> hostNames = new ArrayList<String>();
-
- private final ObjectMapper mapper = new ObjectMapper();
-
public Object[] getStatisticTrend(int trendId) {
Object[] returnArray = null;