This is an automated email from the ASF dual-hosted git repository. alberto pushed a commit to branch support/1.15 in repository https://gitbox.apache.org/repos/asf/geode.git
commit e72da0d984a89203a3a3d5746d509d2c2c1409c1 Author: Alberto Gomez <alberto.go...@est.tech> AuthorDate: Fri Jul 15 08:28:09 2022 +0200 GEODE-10323: Add small changes after review (#7819) --- .../geode/internal/offheap/MemoryAllocatorImpl.java | 18 ++++++++++++++---- .../internal/offheap/MemoryAllocatorJUnitTest.java | 9 +++++---- .../geode/internal/offheap/OffHeapHelperJUnitTest.java | 3 ++- .../offheap/OffHeapRegionEntryHelperInstanceTest.java | 3 ++- .../internal/offheap/OffHeapStorageJUnitTest.java | 3 ++- .../internal/offheap/OffHeapStoredObjectJUnitTest.java | 3 ++- 6 files changed, 27 insertions(+), 12 deletions(-) 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 70f8f4ab0e..d78bc40fb8 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 @@ -187,7 +187,7 @@ public class MemoryAllocatorImpl implements MemoryAllocator { } } return create(oooml, stats, slabCount, offHeapMemorySize, maxSlabSize, slabs, null, - null, () -> null); + null, () -> new DummyNonRealTimeStatsUpdater()); } private void reuse(OutOfOffHeapMemoryListener oooml, OffHeapMemoryStats newStats, @@ -240,9 +240,7 @@ public class MemoryAllocatorImpl implements MemoryAllocator { } void start() { - if (nonRealTimeStatsUpdater != null) { - nonRealTimeStatsUpdater.start(updateOffHeapStatsFrequencyMs); - } + nonRealTimeStatsUpdater.start(updateOffHeapStatsFrequencyMs); } public List<OffHeapStoredObject> getLostChunks(InternalCache cache) { @@ -540,4 +538,16 @@ public class MemoryAllocatorImpl implements MemoryAllocator { public MemoryInspector getMemoryInspector() { return memoryInspector; } + + public static class DummyNonRealTimeStatsUpdater extends NonRealTimeStatsUpdater { + public DummyNonRealTimeStatsUpdater() { + super(null); + } + + @Override + void start(int frequency) {} + + @Override + void stop() {}; + } } diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java index 2626fd051b..b080b7d14c 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java @@ -14,6 +14,7 @@ */ package org.apache.geode.internal.offheap; +import static org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -74,7 +75,7 @@ public class MemoryAllocatorJUnitTest { try { MemoryAllocatorImpl.create(listener, stats, 10, 950, 100, null, size -> { throw new OutOfMemoryError("expected"); - }, null, () -> null); + }, null, () -> new DummyNonRealTimeStatsUpdater()); } catch (OutOfMemoryError expected) { } assertTrue(listener.isClosed()); @@ -99,7 +100,7 @@ public class MemoryAllocatorJUnitTest { } }; MemoryAllocatorImpl.create(listener, stats, 10, 950, MAX_SLAB_SIZE, null, factory, null, - () -> null); + () -> new MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater()); } catch (OutOfMemoryError expected) { } assertTrue(listener.isClosed()); @@ -111,7 +112,7 @@ public class MemoryAllocatorJUnitTest { SlabFactory factory = SlabImpl::new; MemoryAllocator ma = MemoryAllocatorImpl.create(listener, stats, 10, 950, 100, null, factory, null, - () -> null); + () -> new DummyNonRealTimeStatsUpdater()); try { assertFalse(listener.isClosed()); assertFalse(stats.isClosed()); @@ -138,7 +139,7 @@ public class MemoryAllocatorJUnitTest { stats2 = new NullOffHeapMemoryStats(); MemoryAllocator ma2 = MemoryAllocatorImpl.create(listener, stats2, 10, 950, 100, null, factory, null, - () -> null); + () -> new DummyNonRealTimeStatsUpdater()); assertSame(ma, ma2); assertTrue(stats.isClosed()); assertFalse(listener.isClosed()); diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java index 7019848647..8d649d0d1b 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java @@ -14,6 +14,7 @@ */ package org.apache.geode.internal.offheap; +import static org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; @@ -46,7 +47,7 @@ public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase { OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class); ma = MemoryAllocatorImpl.create(ooohml, stats, 3, OffHeapStorage.MIN_SLAB_SIZE * 3, - OffHeapStorage.MIN_SLAB_SIZE, null, () -> null); + OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater()); } /** diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java index 87786d1df5..48f6e87f08 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java @@ -55,6 +55,7 @@ import org.apache.geode.internal.cache.VMCachedDeserializable; import org.apache.geode.internal.cache.entries.DiskEntry; import org.apache.geode.internal.cache.entries.OffHeapRegionEntry; import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap; +import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater; import org.apache.geode.internal.serialization.DSCODE; public class OffHeapRegionEntryHelperInstanceTest { @@ -81,7 +82,7 @@ public class OffHeapRegionEntryHelperInstanceTest { memoryAllocator = MemoryAllocatorImpl.create(listener, stats, 1, OffHeapStorage.MIN_SLAB_SIZE, - OffHeapStorage.MIN_SLAB_SIZE, null, () -> null); + OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater()); offHeapRegionEntryHelperInstance = spy(new OffHeapRegionEntryHelperInstance(ohAddress -> offHeapStoredObject, diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java index d30a4feeca..9f358c9974 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java @@ -30,6 +30,7 @@ import org.apache.geode.StatisticsFactory; import org.apache.geode.distributed.internal.DistributionStats; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater; import org.apache.geode.internal.statistics.LocalStatisticsFactory; import org.apache.geode.util.internal.GeodeGlossary; @@ -168,7 +169,7 @@ public class OffHeapStorageJUnitTest { OutOfOffHeapMemoryListener ooohml = mock(OutOfOffHeapMemoryListener.class); MemoryAllocator ma = OffHeapStorage.basicCreateOffHeapStorage(localStatsFactory, 1024 * 1024, ooohml, null, - () -> null); + () -> new DummyNonRealTimeStatsUpdater()); try { OffHeapMemoryStats stats = ma.getStats(); assertNotNull(stats.getStats()); diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java index d3e1b90bbc..2fc6a65046 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java @@ -42,6 +42,7 @@ import org.apache.geode.internal.cache.BytesAndBitsForCompactor; import org.apache.geode.internal.cache.CachePerfStats; import org.apache.geode.internal.cache.EntryEventImpl; import org.apache.geode.internal.cache.RegionEntryContext; +import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater; import org.apache.geode.internal.offheap.MemoryBlock.State; import org.apache.geode.internal.serialization.DSCODE; import org.apache.geode.internal.serialization.KnownVersion; @@ -74,7 +75,7 @@ public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase { OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class); ma = MemoryAllocatorImpl.create(ooohml, stats, 3, OffHeapStorage.MIN_SLAB_SIZE * 3, - OffHeapStorage.MIN_SLAB_SIZE, null, () -> null); + OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater()); } @After