From b484c5a2ddc66addcf6407da99793bd66609c4d3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 2 Mar 2023 12:53:49 +0100 Subject: [PATCH 1/1] Remove SegmentedJournal.Builder.withCacheSize() This method is used only in tests and has been deprecated. Remove it. JIRA: CONTROLLER-2071 Change-Id: I4428b24b7fd4309d8a393ef3f91975abbb48f677 Signed-off-by: Robert Varga --- .../atomix/storage/journal/SegmentedJournal.java | 14 -------------- .../storage/journal/AbstractJournalTest.java | 7 ++----- .../io/atomix/storage/journal/DiskJournalTest.java | 4 ++-- .../atomix/storage/journal/MappedJournalTest.java | 4 ++-- .../atomix/storage/journal/MemoryJournalTest.java | 4 ++-- .../storage/journal/PersistentJournalTest.java | 4 ++-- 6 files changed, 10 insertions(+), 27 deletions(-) diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java index 92f4eba573..893ae4f944 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java @@ -821,20 +821,6 @@ public final class SegmentedJournal implements Journal { return this; } - /** - * Sets the journal cache size. - * - * @param cacheSize the journal cache size - * @return the journal builder - * @throws IllegalArgumentException if the cache size is not positive - * @deprecated since 3.0.4 - */ - @Deprecated - public Builder withCacheSize(int cacheSize) { - checkArgument(cacheSize >= 0, "cacheSize must be positive"); - return this; - } - /** * Enables flushing buffers to disk when entries are committed to a segment, returning the builder for method * chaining. diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java index 3c9597fa7c..6c03b922f7 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java @@ -54,12 +54,10 @@ public abstract class AbstractJournalTest { private static final Path PATH = Paths.get("target/test-logs/"); private final int maxSegmentSize; - private final int cacheSize; protected final int entriesPerSegment; - protected AbstractJournalTest(int maxSegmentSize, int cacheSize) { + protected AbstractJournalTest(int maxSegmentSize) { this.maxSegmentSize = maxSegmentSize; - this.cacheSize = cacheSize; int entryLength = (NAMESPACE.serialize(ENTRY).length + 8); this.entriesPerSegment = (maxSegmentSize - 64) / entryLength; } @@ -71,7 +69,7 @@ public abstract class AbstractJournalTest { List runs = new ArrayList<>(); for (int i = 1; i <= 10; i++) { for (int j = 1; j <= 10; j++) { - runs.add(new Object[]{64 + (i * (NAMESPACE.serialize(ENTRY).length + 8) + j), j}); + runs.add(new Object[]{64 + (i * (NAMESPACE.serialize(ENTRY).length + 8) + j)}); } } return runs; @@ -85,7 +83,6 @@ public abstract class AbstractJournalTest { .withStorageLevel(storageLevel()) .withMaxSegmentSize(maxSegmentSize) .withIndexDensity(.2) - .withCacheSize(cacheSize) .build(); } diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java index e0161aee17..2b3216e87c 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java @@ -19,8 +19,8 @@ package io.atomix.storage.journal; * Disk journal test. */ public class DiskJournalTest extends PersistentJournalTest { - public DiskJournalTest(int maxSegmentSize, int cacheSize) { - super(maxSegmentSize, cacheSize); + public DiskJournalTest(int maxSegmentSize) { + super(maxSegmentSize); } @Override diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java index fefee271db..7ccfe3d8f4 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java @@ -19,8 +19,8 @@ package io.atomix.storage.journal; * Memory mapped journal test. */ public class MappedJournalTest extends PersistentJournalTest { - public MappedJournalTest(int maxSegmentSize, int cacheSize) { - super(maxSegmentSize, cacheSize); + public MappedJournalTest(int maxSegmentSize) { + super(maxSegmentSize); } @Override diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java index 4b501f32cc..7689718515 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java @@ -20,8 +20,8 @@ package io.atomix.storage.journal; */ @Deprecated public class MemoryJournalTest extends AbstractJournalTest { - public MemoryJournalTest(int maxSegmentSize, int cacheSize) { - super(maxSegmentSize, cacheSize); + public MemoryJournalTest(int maxSegmentSize) { + super(maxSegmentSize); } @Override diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java index e76f5614c9..c25734050f 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java @@ -24,8 +24,8 @@ import static org.junit.Assert.assertTrue; * Persistent journal test base. */ public abstract class PersistentJournalTest extends AbstractJournalTest { - protected PersistentJournalTest(int maxSegmentSize, int cacheSize) { - super(maxSegmentSize, cacheSize); + protected PersistentJournalTest(int maxSegmentSize) { + super(maxSegmentSize); } /** -- 2.36.6