http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java index f09495f..77fc21e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey1.java @@ -147,7 +147,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey1 // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); }
http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java index 6c3940d..25caf89 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapStringKey2.java @@ -159,7 +159,7 @@ public class VersionedThinLRURegionEntryOffHeapStringKey2 // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java index ab6ecba..dc3e2ff 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinLRURegionEntryOffHeapUUIDKey.java @@ -131,7 +131,7 @@ public class VersionedThinLRURegionEntryOffHeapUUIDKey extends VersionedThinLRUR // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java index f3330ac..b2181d0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapIntKey.java @@ -67,7 +67,7 @@ public class VersionedThinRegionEntryHeapIntKey extends VersionedThinRegionEntry this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java index 20dd863..901e64d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapLongKey.java @@ -67,7 +67,7 @@ public class VersionedThinRegionEntryHeapLongKey extends VersionedThinRegionEntr this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java index 665fa49..27fb4bd 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapObjectKey.java @@ -69,7 +69,7 @@ public class VersionedThinRegionEntryHeapObjectKey extends VersionedThinRegionEn this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java index 6b5783e..05d32cb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey1.java @@ -86,7 +86,7 @@ public class VersionedThinRegionEntryHeapStringKey1 extends VersionedThinRegionE this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java index 5cdf57d..68e9a61 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapStringKey2.java @@ -98,7 +98,7 @@ public class VersionedThinRegionEntryHeapStringKey2 extends VersionedThinRegionE this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java index 1900435..fcc2a68 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java @@ -69,7 +69,7 @@ public class VersionedThinRegionEntryHeapUUIDKey extends VersionedThinRegionEntr this.value = v; } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java index e920222..22baf55 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java @@ -126,7 +126,7 @@ public class VersionedThinRegionEntryOffHeapIntKey extends VersionedThinRegionEn // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java index 8b3de9d..931faef 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapLongKey.java @@ -126,7 +126,7 @@ public class VersionedThinRegionEntryOffHeapLongKey extends VersionedThinRegionE // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java index 90ac91a..1f0554e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapObjectKey.java @@ -127,7 +127,7 @@ public class VersionedThinRegionEntryOffHeapObjectKey extends VersionedThinRegio // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java index 80b4237..0a2ee2a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey1.java @@ -144,7 +144,7 @@ public class VersionedThinRegionEntryOffHeapStringKey1 extends VersionedThinRegi // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java index f1dd95e..c834c4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapStringKey2.java @@ -156,7 +156,7 @@ public class VersionedThinRegionEntryOffHeapStringKey2 extends VersionedThinRegi // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java index cd9c4c3..9401e7e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapUUIDKey.java @@ -128,7 +128,7 @@ public class VersionedThinRegionEntryOffHeapUUIDKey extends VersionedThinRegionE // } } - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java index 7578f15..d5e39a9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java @@ -14,17 +14,33 @@ */ package org.apache.geode.internal.cache.control; +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryMXBean; +import java.lang.management.MemoryPoolMXBean; +import java.lang.management.MemoryType; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; + +import javax.management.ListenerNotFoundException; +import javax.management.Notification; +import javax.management.NotificationEmitter; +import javax.management.NotificationListener; + +import org.apache.logging.log4j.Logger; + import org.apache.geode.CancelException; import org.apache.geode.SystemFailure; import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.query.internal.QueryMonitor; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; -import org.apache.geode.internal.statistics.GemFireStatSampler; -import org.apache.geode.internal.statistics.LocalStatListener; import org.apache.geode.internal.SetUtils; -import org.apache.geode.internal.statistics.StatisticsImpl; -import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType; import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState; import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile; @@ -32,19 +48,9 @@ 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 javax.management.ListenerNotFoundException; -import javax.management.Notification; -import javax.management.NotificationEmitter; -import javax.management.NotificationListener; -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryMXBean; -import java.lang.management.MemoryPoolMXBean; -import java.lang.management.MemoryType; -import java.util.List; -import java.util.Set; -import java.util.concurrent.*; +import org.apache.geode.internal.statistics.GemFireStatSampler; +import org.apache.geode.internal.statistics.LocalStatListener; +import org.apache.geode.internal.statistics.StatisticsImpl; /** * Allows for the setting of eviction and critical thresholds. These thresholds are compared against @@ -67,8 +73,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { DistributionConfig.GEMFIRE_PREFIX + "heapPollerInterval"; // Internal for polling the JVM for changes in heap memory usage. - private static final int POLLER_INTERVAL = - Integer.getInteger(POLLER_INTERVAL_PROP, 500).intValue(); + private static final int POLLER_INTERVAL = Integer.getInteger(POLLER_INTERVAL_PROP, 500); // This holds a new event as it transitions from updateStateAndSendEvent(...) to fillInProfile() private ThreadLocal<MemoryEvent> upcomingEvent = new ThreadLocal<MemoryEvent>(); @@ -153,14 +158,12 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { private final InternalResourceManager resourceManager; private final ResourceAdvisor resourceAdvisor; - private final GemFireCacheImpl cache; + private final InternalCache cache; private final ResourceManagerStats stats; private static boolean testDisableMemoryUpdates = false; private static long testBytesUsedForThresholdSet = -1; - - /** * Determines if the name of the memory pool MXBean provided matches a list of known tenured pool * names. @@ -189,7 +192,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { || (HEAP_POOL != null && name.equals(HEAP_POOL)); } - HeapMemoryMonitor(final InternalResourceManager resourceManager, final GemFireCacheImpl cache, + HeapMemoryMonitor(final InternalResourceManager resourceManager, final InternalCache cache, final ResourceManagerStats stats) { this.resourceManager = resourceManager; this.resourceAdvisor = (ResourceAdvisor) cache.getDistributionAdvisor(); @@ -273,9 +276,8 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { try { emitter.removeNotificationListener(this, null, null); this.cache.getLoggerI18n().fine("Removed Memory MXBean notification listener" + this); - } catch (ListenerNotFoundException e) { - this.cache.getLoggerI18n().fine( - "This instance '" + toString() + "' was not registered as a Memory MXBean listener"); + } catch (ListenerNotFoundException ignore) { + logger.debug("This instance '{}' was not registered as a Memory MXBean listener", this); } // Stop the stats listener @@ -574,7 +576,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { final long usageThreshold = memoryPoolMXBean.getUsageThreshold(); this.cache.getLoggerI18n().info( LocalizedStrings.HeapMemoryMonitor_OVERRIDDING_MEMORYPOOLMXBEAN_HEAP_0_NAME_1, - new Object[] {Long.valueOf(usageThreshold), memoryPoolMXBean.getName()}); + new Object[] {usageThreshold, memoryPoolMXBean.getName()}); MemoryMXBean mbean = ManagementFactory.getMemoryMXBean(); NotificationEmitter emitter = (NotificationEmitter) mbean; @@ -783,12 +785,12 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { HeapMemoryMonitor.this.cache.getLoggerI18n().fine( "StatSampler scheduled a " + "handleNotification call with " + usedBytes + " bytes"); } - } catch (RejectedExecutionException e) { + } catch (RejectedExecutionException ignore) { if (!HeapMemoryMonitor.this.resourceManager.isClosed()) { - HeapMemoryMonitor.this.cache.getLoggerI18n() - .warning(LocalizedStrings.ResourceManager_REJECTED_EXECUTION_CAUSE_NOHEAP_EVENTS); + logger.warn(LocalizedMessage + .create(LocalizedStrings.ResourceManager_REJECTED_EXECUTION_CAUSE_NOHEAP_EVENTS)); } - } catch (CacheClosedException e) { + } catch (CacheClosedException ignore) { // nothing to do } } @@ -803,7 +805,6 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { /** * Polls the heap if stat sampling is disabled. - * */ class HeapPoller implements Runnable { @SuppressWarnings("synthetic-access") @@ -839,9 +840,9 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { this.thresholds = newThresholds; StringBuilder builder = new StringBuilder("In testing, the following values were set"); - builder.append(" maxMemoryBytes:" + newThresholds.getMaxMemoryBytes()); - builder.append(" criticalThresholdBytes:" + newThresholds.getCriticalThresholdBytes()); - builder.append(" evictionThresholdBytes:" + newThresholds.getEvictionThresholdBytes()); + builder.append(" maxMemoryBytes:").append(newThresholds.getMaxMemoryBytes()); + builder.append(" criticalThresholdBytes:").append(newThresholds.getCriticalThresholdBytes()); + builder.append(" evictionThresholdBytes:").append(newThresholds.getEvictionThresholdBytes()); this.cache.getLoggerI18n().fine(builder.toString()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java index e98b6db..48cb34e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java @@ -14,6 +14,23 @@ */ package org.apache.geode.internal.cache.control; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.logging.log4j.Logger; + import org.apache.geode.CancelCriterion; import org.apache.geode.InternalGemFireError; import org.apache.geode.cache.Cache; @@ -27,7 +44,7 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.OverflowQueueWithDMStats; import org.apache.geode.distributed.internal.SerialQueuedExecutorWithDMStats; 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.cache.PartitionedRegion; import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile; import org.apache.geode.internal.cache.partitioned.LoadProbe; @@ -36,16 +53,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.logging.log4j.Logger; - -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; /** - * Implementation of ResourceManager with additional internal-only methods. TODO: cleanup raw and - * typed collections - * + * Implementation of ResourceManager with additional internal-only methods. + * <p> + * TODO: cleanup raw and typed collections */ public class InternalResourceManager implements ResourceManager { private static final Logger logger = LogService.getLogger(); @@ -56,12 +68,12 @@ public class InternalResourceManager implements ResourceManager { public enum ResourceType { HEAP_MEMORY(0x1), OFFHEAP_MEMORY(0x2), MEMORY(0x3), ALL(0xFFFFFFFF); - int id; + final int id; - private ResourceType(final int id) { + ResourceType(final int id) { this.id = id; } - }; + } private Map<ResourceType, Set<ResourceListener>> listeners = new HashMap<ResourceType, Set<ResourceListener>>(); @@ -73,7 +85,7 @@ public class InternalResourceManager implements ResourceManager { private final Set<RebalanceOperation> inProgressOperations = new HashSet<RebalanceOperation>(); private final Object inProgressOperationsLock = new Object(); - final GemFireCacheImpl cache; + final InternalCache cache; private LoadProbe loadProbe; @@ -93,11 +105,11 @@ public class InternalResourceManager implements ResourceManager { return (InternalResourceManager) cache.getResourceManager(); } - public static InternalResourceManager createResourceManager(final GemFireCacheImpl cache) { + public static InternalResourceManager createResourceManager(final InternalCache cache) { return new InternalResourceManager(cache); } - private InternalResourceManager(GemFireCacheImpl cache) { + private InternalResourceManager(InternalCache cache) { this.cache = cache; this.resourceAdvisor = (ResourceAdvisor) cache.getDistributionAdvisor(); this.stats = new ResourceManagerStats(cache.getDistributedSystem()); @@ -118,9 +130,8 @@ public class InternalResourceManager implements ResourceManager { return thread; } }; - int nThreads = MAX_RESOURCE_MANAGER_EXE_THREADS; - this.scheduledExecutor = new ScheduledThreadPoolExecutor(nThreads, tf); + this.scheduledExecutor = new ScheduledThreadPoolExecutor(MAX_RESOURCE_MANAGER_EXE_THREADS, tf); // Initialize the load probe try { @@ -281,7 +292,7 @@ public class InternalResourceManager implements ResourceManager { void runWithNotifyExecutor(Runnable runnable) { try { this.notifyExecutor.execute(runnable); - } catch (RejectedExecutionException e) { + } catch (RejectedExecutionException ignore) { if (!isClosed()) { this.cache.getLoggerI18n() .warning(LocalizedStrings.ResourceManager_REJECTED_EXECUTION_CAUSE_NOHEAP_EVENTS); http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java index c9fe6b6..151d2d5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java @@ -19,7 +19,7 @@ import java.util.Set; import org.apache.logging.log4j.Logger; import org.apache.geode.CancelException; -import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType; import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState; import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile; @@ -56,7 +56,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener private final OffHeapMemoryUsageListener offHeapMemoryUsageListener; private final InternalResourceManager resourceManager; private final ResourceAdvisor resourceAdvisor; - private final GemFireCacheImpl cache; + private final InternalCache cache; private final ResourceManagerStats stats; /** * InternalResoruceManager insists on creating a OffHeapMemoryMonitor even when it does not have @@ -64,7 +64,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener */ private final MemoryAllocator memoryAllocator; - OffHeapMemoryMonitor(final InternalResourceManager resourceManager, final GemFireCacheImpl cache, + OffHeapMemoryMonitor(final InternalResourceManager resourceManager, final InternalCache cache, final MemoryAllocator memoryAllocator, final ResourceManagerStats stats) { this.resourceManager = resourceManager; this.resourceAdvisor = (ResourceAdvisor) cache.getDistributionAdvisor(); @@ -131,7 +131,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener if (threadToWaitFor != null) { try { threadToWaitFor.join(); - } catch (InterruptedException e) { + } catch (InterruptedException ignore) { Thread.currentThread().interrupt(); } } @@ -548,7 +548,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener try { this.wait(MS_TIMEOUT); this.deliverEvent = false; - } catch (InterruptedException iex) { + } catch (InterruptedException ignore) { logger.warn("OffHeapMemoryUsageListener was interrupted {}", this); this.stopRequested = true; exitRunLoop = true; http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java index cd9eab3..4a04bfe 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java @@ -12,9 +12,23 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache.control; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.logging.log4j.Logger; + import org.apache.geode.GemFireException; import org.apache.geode.InternalGemFireError; import org.apache.geode.SystemFailure; @@ -23,37 +37,28 @@ import org.apache.geode.cache.control.RebalanceOperation; import org.apache.geode.cache.control.RebalanceResults; import org.apache.geode.cache.partition.PartitionRebalanceInfo; 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.PartitionedRegion; import org.apache.geode.internal.cache.partitioned.PartitionedRegionRebalanceOp; import org.apache.geode.internal.cache.partitioned.rebalance.CompositeDirector; import org.apache.geode.internal.logging.LogService; -import org.apache.logging.log4j.Logger; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; /** - * Implements <code>RebalanceOperation</code> for rebalancing Cache resources. - * + * Implements {@code RebalanceOperation} for rebalancing Cache resources. */ @SuppressWarnings("synthetic-access") public class RebalanceOperationImpl implements RebalanceOperation { - private static final Logger logger = LogService.getLogger(); private final boolean simulation; - private final GemFireCacheImpl cache; + private final InternalCache cache; private List<Future<RebalanceResults>> futureList = new ArrayList<Future<RebalanceResults>>(); private int pendingTasks; private final AtomicBoolean cancelled = new AtomicBoolean(); private final Object futureLock = new Object(); private RegionFilter filter; - RebalanceOperationImpl(GemFireCacheImpl cache, boolean simulation, RegionFilter filter) { + RebalanceOperationImpl(InternalCache cache, boolean simulation, RegionFilter filter) { this.simulation = simulation; this.cache = cache; this.filter = filter; @@ -97,7 +102,7 @@ public class RebalanceOperationImpl implements RebalanceOperation { this.futureList.add(submitRebalanceTask(prOp, start)); } } - } catch (RegionDestroyedException e) { + } catch (RegionDestroyedException ignore) { // ignore, go on to the next region } } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java index 0151f00..da0c190 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java @@ -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.control; import java.io.DataInput; @@ -37,6 +36,7 @@ import org.apache.geode.distributed.internal.ReplyException; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; 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.UpdateAttributesProcessor; import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType; import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState; @@ -82,18 +82,12 @@ public class ResourceAdvisor extends DistributionAdvisor { this.profiles = new ResourceManagerProfile[] {profile}; } - /* - * (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; ResourceManagerProfile p = null; try { - final GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + final InternalCache cache = GemFireCacheImpl.getInstance(); if (cache != null && !cache.isClosed()) { final ResourceAdvisor ra = cache.getInternalResourceManager().getResourceAdvisor(); if (this.profiles != null) { @@ -110,7 +104,7 @@ public class ResourceAdvisor extends DistributionAdvisor { logger.debug("No cache: {}", this); } } - } catch (CancelException e) { + } catch (CancelException ignore) { if (logger.isDebugEnabled()) { logger.debug("Cache closed: {}", this); } @@ -137,11 +131,6 @@ public class ResourceAdvisor extends DistributionAdvisor { } } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID() - */ @Override public int getDSFID() { return RESOURCE_PROFILE_MESSAGE; @@ -184,7 +173,6 @@ public class ResourceAdvisor extends DistributionAdvisor { * @param irm The resource manager which is requesting distribution * @param recips The recipients of the message * @param profile Profile to send in this message - * @throws ReplyException */ public static void send(final InternalResourceManager irm, Set<InternalDistributedMember> recips, ResourceManagerProfile profile) { @@ -235,7 +223,7 @@ public class ResourceAdvisor extends DistributionAdvisor { } private InternalResourceManager getResourceManager() { - return ((GemFireCacheImpl) getAdvisee()).getInternalResourceManager(false); + return ((InternalCache) getAdvisee()).getInternalResourceManager(false); } @SuppressWarnings("synthetic-access") @@ -288,7 +276,7 @@ public class ResourceAdvisor extends DistributionAdvisor { @Override public String toString() { - return new StringBuilder().append("ResourceAdvisor for ResourceManager " + getAdvisee()) + return new StringBuilder().append("ResourceAdvisor for ResourceManager ").append(getAdvisee()) .toString(); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java index dcadab0..fe7b3d3 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutor.java @@ -27,7 +27,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.cache.DistributedRegion; -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.control.MemoryThresholds; import org.apache.geode.internal.i18n.LocalizedStrings; @@ -404,7 +404,7 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution { */ @Override public void validateExecution(Function function, Set targetMembers) { - GemFireCacheImpl cache = region.getGemFireCache(); + InternalCache cache = region.getGemFireCache(); if (cache != null && cache.getTxManager().getTXState() != null) { if (targetMembers.size() > 1) { throw new TransactionException( @@ -419,18 +419,18 @@ public class DistributedRegionFunctionExecutor extends AbstractExecution { } else if (!target.equals(funcTarget)) { throw new TransactionDataNotColocatedException( LocalizedStrings.PartitionedRegion_TX_FUNCTION_EXECUTION_NOT_COLOCATED_0_1 - .toLocalizedString(new Object[] {target, funcTarget})); + .toLocalizedString(target, funcTarget)); } } } if (!MemoryThresholds.isLowMemoryExceptionDisabled() && function.optimizeForWrite()) { try { region.checkIfAboveThreshold(null); - } catch (LowMemoryException e) { + } catch (LowMemoryException ignore) { Set<DistributedMember> htrm = region.getMemoryThresholdReachedMembers(); throw new LowMemoryException( LocalizedStrings.ResourceManager_LOW_MEMORY_FOR_0_FUNCEXEC_MEMBERS_1 - .toLocalizedString(new Object[] {function.getId(), htrm}), + .toLocalizedString(function.getId(), htrm), htrm); } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java index 3c5045a..c9d3fd8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java @@ -23,16 +23,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.DM; import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage; import org.apache.geode.internal.cache.ForceReattemptException; -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; -/** - * - * - */ -public final class DistributedRegionFunctionResultSender implements InternalResultSender { +public class DistributedRegionFunctionResultSender implements InternalResultSender { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java index 18700a7..5b1146f 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java @@ -163,7 +163,7 @@ public class FunctionExecutionNodePruner { // return node; return (nodesOfEqualSize.size() > 0 - ? nodesOfEqualSize.get(PartitionedRegion.rand.nextInt(nodesOfEqualSize.size())) : null); + ? nodesOfEqualSize.get(PartitionedRegion.RANDOM.nextInt(nodesOfEqualSize.size())) : null); } public static HashMap<Integer, HashSet> groupByBucket(PartitionedRegion pr, Set routingKeys, http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollectorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollectorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollectorImpl.java index 9268e55..e0fe28f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollectorImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/LocalResultCollectorImpl.java @@ -24,10 +24,9 @@ import org.apache.geode.cache.execute.FunctionInvocationTargetException; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.ReplyProcessor21; -import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.i18n.LocalizedStrings; -public final class LocalResultCollectorImpl implements LocalResultCollector { +public class LocalResultCollectorImpl implements LocalResultCollector { private final ResultCollector userRC; http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java index 74034e4..ab6794b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java @@ -36,11 +36,10 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe import org.apache.geode.internal.Assert; import org.apache.geode.internal.SetUtils; import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.control.MemoryThresholds; import org.apache.geode.internal.i18n.LocalizedStrings; -/** - */ public class MemberFunctionExecutor extends AbstractExecution { protected InternalDistributedSystem ds; @@ -131,7 +130,7 @@ public class MemberFunctionExecutor extends AbstractExecution { final FunctionContext context = new FunctionContextImpl(function.getId(), getArgumentsForMember(localVM.getId()), resultSender); boolean isTx = false; - GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + InternalCache cache = GemFireCacheImpl.getInstance(); if (cache != null) { isTx = cache.getTxManager().getTXState() == null ? false : true; } @@ -156,13 +155,9 @@ public class MemberFunctionExecutor extends AbstractExecution { return localRC; } - /** - * @param function - * @param dest - */ @Override public void validateExecution(final Function function, final Set dest) { - final GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + final InternalCache cache = GemFireCacheImpl.getInstance(); if (cache != null && cache.getTxManager().getTXState() != null) { if (dest.size() > 1) { throw new TransactionException( http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java index a3ae2c0..27542f5 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import org.apache.geode.cache.Cache; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.LowMemoryException; import org.apache.geode.cache.Region; @@ -38,15 +37,12 @@ import org.apache.geode.internal.Assert; import org.apache.geode.internal.SetUtils; import org.apache.geode.internal.cache.DistributedRegion; 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.MemoryThresholds; import org.apache.geode.internal.i18n.LocalizedStrings; -/** - * - * - */ public class MultiRegionFunctionExecutor extends AbstractExecution { private final Set<Region> regions; @@ -210,7 +206,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { LocalizedStrings.MemberFunctionExecutor_NO_MEMBER_FOUND_FOR_EXECUTING_FUNCTION_0 .toLocalizedString(function.getId())); } - final GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + final InternalCache cache = GemFireCacheImpl.getInstance(); if (function.optimizeForWrite() && cache != null && cache.getInternalResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest) && !MemoryThresholds.isLowMemoryExceptionDisabled()) { @@ -218,7 +214,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { Set<DistributedMember> sm = SetUtils.intersection(hcm, dest); throw new LowMemoryException( LocalizedStrings.ResourceManager_LOW_MEMORY_FOR_0_FUNCEXEC_MEMBERS_1 - .toLocalizedString(new Object[] {function.getId(), sm}), + .toLocalizedString(function.getId(), sm), sm); } setExecutionNodes(dest); @@ -243,7 +239,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { Set<String> regionPathSet = memberToRegionMap.get(localVM); Set<Region> regions = new HashSet<Region>(); if (regionPathSet != null) { - Cache cache1 = GemFireCacheImpl.getInstance(); + InternalCache cache1 = GemFireCacheImpl.getInstance(); for (String regionPath : regionPathSet) { regions.add(cache1.getRegion(regionPath)); } @@ -263,8 +259,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { MultiRegionFunctionResultWaiter waiter = new MultiRegionFunctionResultWaiter(ds, localResultCollector, function, dest, memberArgs, resultSender, memberToRegionMap); - ResultCollector reply = waiter.getFunctionResultFrom(dest, function, this); - return reply; + return waiter.getFunctionResultFrom(dest, function, this); } return localResultCollector; } @@ -280,7 +275,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { PartitionedRegion pr = (PartitionedRegion) region; Set<InternalDistributedMember> prMembers = pr.getRegionAdvisor().advisePrimaryOwners(); if (pr.isDataStore()) { - GemFireCacheImpl cache = (GemFireCacheImpl) region.getCache(); + InternalCache cache = (InternalCache) region.getCache(); // Add local node InternalDistributedMember localVm = cache.getMyId(); Set<String> regions = memberToRegions.get(localVm); @@ -334,7 +329,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { memberToRegions.put(member, regions); } } else if (dp.withReplication()) { - GemFireCacheImpl cache = (GemFireCacheImpl) region.getCache(); + InternalCache cache = (InternalCache) region.getCache(); // Add local node InternalDistributedMember local = cache.getMyId(); Set<String> regions = memberToRegions.get(local); @@ -345,7 +340,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { memberToRegions.put(local, regions); } } else if (region instanceof LocalRegion) { - GemFireCacheImpl cache = (GemFireCacheImpl) region.getCache(); + InternalCache cache = (InternalCache) region.getCache(); // Add local node InternalDistributedMember local = cache.getMyId(); Set<String> regions = memberToRegions.get(local); @@ -366,9 +361,9 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { @Override public void validateExecution(Function function, Set targetMembers) { - GemFireCacheImpl cache = null; + InternalCache cache = null; for (Region r : regions) { - cache = (GemFireCacheImpl) r.getCache(); + cache = (InternalCache) r.getCache(); break; } if (cache != null && cache.getTxManager().getTXState() != null) { @@ -385,7 +380,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { } else if (!target.equals(funcTarget)) { throw new TransactionDataNotColocatedException( LocalizedStrings.PartitionedRegion_TX_FUNCTION_EXECUTION_NOT_COLOCATED_0_1 - .toLocalizedString(new Object[] {target, funcTarget})); + .toLocalizedString(target, funcTarget)); } } } @@ -396,7 +391,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution { Set<DistributedMember> sm = SetUtils.intersection(hcm, targetMembers); throw new LowMemoryException( LocalizedStrings.ResourceManager_LOW_MEMORY_FOR_0_FUNCEXEC_MEMBERS_1 - .toLocalizedString(new Object[] {function.getId(), sm}), + .toLocalizedString(function.getId(), sm), sm); } } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java index c7a7d36..6e13ebc 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java @@ -12,11 +12,9 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache.execute; import java.util.Iterator; -import java.util.NoSuchElementException; import java.util.Set; import org.apache.geode.cache.LowMemoryException; @@ -30,16 +28,12 @@ import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.SetUtils; -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.MemoryThresholds; import org.apache.geode.internal.i18n.LocalizedStrings; -/** - * - * - */ public class PartitionedRegionFunctionExecutor extends AbstractExecution { private final PartitionedRegion pr; @@ -332,16 +326,9 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution { return buf.toString(); } - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.internal.cache.execute.AbstractExecution#validateExecution(org.apache.geode. - * cache.execute.Function, java.util.Set) - */ @Override public void validateExecution(Function function, Set targetMembers) { - GemFireCacheImpl cache = pr.getGemFireCache(); + InternalCache cache = pr.getGemFireCache(); if (cache != null && cache.getTxManager().getTXState() != null) { if (targetMembers.size() > 1) { throw new TransactionException( @@ -356,7 +343,7 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution { } else if (!target.equals(funcTarget)) { throw new TransactionDataRebalancedException( LocalizedStrings.PartitionedRegion_TX_FUNCTION_EXECUTION_NOT_COLOCATED_0_1 - .toLocalizedString(new Object[] {target, funcTarget})); + .toLocalizedString(target, funcTarget)); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java index 3a20dc3..18ba32b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerRegionFunctionExecutor.java @@ -12,9 +12,12 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package org.apache.geode.internal.cache.execute; +import java.util.Set; + +import org.apache.logging.log4j.Logger; + import org.apache.geode.cache.CacheClosedException; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.internal.ProxyCache; @@ -26,28 +29,23 @@ import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; 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.TXStateProxyImpl; import org.apache.geode.internal.cache.execute.util.SynchronizedResultCollector; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.internal.logging.LogService; -import java.util.Set; - -import org.apache.logging.log4j.Logger; - /** - * * Executes Function with FunctionService#onRegion(Region region) in client server mode. * * @see FunctionService#onRegion(Region) * * @since GemFire 5.8 LA - * */ public class ServerRegionFunctionExecutor extends AbstractExecution { private static final Logger logger = LogService.getLogger(); - final private LocalRegion region; + private final LocalRegion region; private boolean executeOnBucketSet = false; public ServerRegionFunctionExecutor(Region r, ProxyCache proxyCache) { @@ -288,11 +286,12 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { } return srp; } else { - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); message.append(srp).append(": "); - message.append( - "No available connection was found. Server Region Proxy is not available for this region " - + region.getName()); + message + .append( + "No available connection was found. Server Region Proxy is not available for this region ") + .append(region.getName()); throw new FunctionException(message.toString()); } } @@ -340,16 +339,9 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { return new ServerRegionFunctionExecutor(this, argument); } - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.internal.cache.execute.AbstractExecution#validateExecution(org.apache.geode. - * cache.execute.Function, java.util.Set) - */ @Override public void validateExecution(Function function, Set targetMembers) { - GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + InternalCache cache = GemFireCacheImpl.getInstance(); if (cache != null && cache.getTxManager().getTXState() != null) { TXStateProxyImpl tx = (TXStateProxyImpl) cache.getTxManager().getTXState(); tx.getRealDeal(null, region); @@ -357,7 +349,6 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { } } - @Override public ResultCollector execute(final String functionName) { if (functionName == null) { @@ -472,6 +463,4 @@ public class ServerRegionFunctionExecutor extends AbstractExecution { public boolean getExecuteOnBucketSetFlag() { return this.executeOnBucketSet; } - - } http://git-wip-us.apache.org/repos/asf/geode/blob/57e93a5a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java index 13d8e18..f78de18 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java @@ -21,18 +21,17 @@ import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; 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.RestAgent; /** * The FindRestEnabledServersFunction class is a gemfire function that gives details about REST * enabled gemfire servers. - * <p/> * * @since GemFire 8.1 */ - public class FindRestEnabledServersFunction extends FunctionAdapter implements InternalEntity { + private static final long serialVersionUID = 7851518767859544678L; /** * This property defines internal function that will get executed on each node to fetch active @@ -40,20 +39,17 @@ public class FindRestEnabledServersFunction extends FunctionAdapter implements I */ public static final String FIND_REST_ENABLED_SERVERS_FUNCTION_ID = FindRestEnabledServersFunction.class.getName(); - private static final long serialVersionUID = 7851518767859544678L; - public void execute(FunctionContext context) { - try { - GemFireCacheImpl c = (GemFireCacheImpl) CacheFactory.getAnyInstance(); + InternalCache cache = (InternalCache) CacheFactory.getAnyInstance(); DistributionConfig config = InternalDistributedSystem.getAnyInstance().getConfig(); String bindAddress = RestAgent.getBindAddressForHttpService(config); final String protocolType = config.getHttpServiceSSLEnabled() ? "https" : "http"; - if (c.isRESTServiceRunning()) { + if (cache.isRESTServiceRunning()) { context.getResultSender() .lastResult(protocolType + "://" + bindAddress + ":" + config.getHttpServicePort()); @@ -62,7 +58,6 @@ public class FindRestEnabledServersFunction extends FunctionAdapter implements I } } catch (CacheClosedException ex) { context.getResultSender().lastResult(""); - } }
