Move indexCount(), indexSpacing() and rollCycle() to RollingChronicle…

…Queue
OpenHFT · Jul 19, 2016 · 14e1575 · 14e1575
1 parent d80aca0
commit 14e1575
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/net/openhft/chronicle/queue/ChronicleQueue.java b/src/main/java/net/openhft/chronicle/queue/ChronicleQueue.java
@@ -125,11 +125,5 @@ default void dump(OutputStream stream, long fromIndex, long toIndex) {
         dump(new OutputStreamWriter(stream, StandardCharsets.UTF_8), fromIndex, toIndex);
     }
 
-    int indexCount();
-
-    int indexSpacing();
-
     int sourceId();
-
-    RollCycle rollCycle();
 }
diff --git a/src/main/java/net/openhft/chronicle/queue/impl/RollingChronicleQueue.java b/src/main/java/net/openhft/chronicle/queue/impl/RollingChronicleQueue.java
@@ -71,6 +71,16 @@ public interface RollingChronicleQueue extends ChronicleQueue {
      */
     int cycle();
 
+    /**
+     * @return the number of entries in an index meta data entry
+     */
+    int indexCount();
+
+    /**
+     * @return the spacing between indexed entries. If 1 then every entry is indexed.
+     */
+    int indexSpacing();
+
     RollCycle rollCycle();
 
     Function<WireType, StoreRecovery> recoverySupplier();

diff --git a/src/test/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueTest.java b/src/test/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueTest.java
@@ -1749,7 +1749,7 @@ public void dontPassQueueToReader() {
     @Test
     public void testToEndBeforeWrite() {
         File tmpDir = getTmpDir();
-        try (ChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
+        try (RollingChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
                 .rollCycle(TEST2_DAILY)
                 .wireType(this.wireType)
                 .build()) {
@@ -1771,7 +1771,7 @@ public void testToEndBeforeWrite() {
     @Test
     public void testSomeMessages() {
         File tmpDir = getTmpDir();
-        try (ChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
+        try (RollingChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
                 .rollCycle(TEST2_DAILY)
                 .wireType(this.wireType)
                 .build()) {
@@ -1795,7 +1795,7 @@ public void testSomeMessages() {
     @Test
     public void testForwardFollowedBackBackwardTailer() {
         File tmpDir = getTmpDir();
-        try (ChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
+        try (RollingChronicleQueue chronicle = SingleChronicleQueueBuilder.binary(tmpDir)
                 .rollCycle(TEST2_DAILY)
                 .wireType(this.wireType)
                 .build()) {
@@ -1960,7 +1960,7 @@ public void testMapWrapper() throws TimeoutException, StreamCorruptedException {
     @Test
     public void testAppendedSkipToEnd() throws TimeoutException, ExecutionException, InterruptedException {
 
-        try (ChronicleQueue q = SingleChronicleQueueBuilder.binary(getTmpDir())
+        try (RollingChronicleQueue q = SingleChronicleQueueBuilder.binary(getTmpDir())
                 .wireType(this.wireType)
                 .build()) {