fixed test case net.openhft.chronicle.queue.impl.single.RollCycleEnco…

…deSequenceTest
OpenHFT · Nov 22, 2017 · 4dfe875 · 4dfe875
1 parent 4674fe1
commit 4dfe875
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/net/openhft/chronicle/queue/impl/single/RollCycleEncodeSequence.java b/src/main/java/net/openhft/chronicle/queue/impl/single/RollCycleEncodeSequence.java
@@ -17,7 +17,6 @@ class RollCycleEncodeSequence implements Sequence {
         this.sequenceMask = (1L << cycleShift) - 1;
         this.writePositionAndSequence = writePositionAndSequence instanceof TwoLongValue ?
                 (TwoLongValue) writePositionAndSequence : null;
-
     }
 
     @Override
@@ -58,8 +57,8 @@ public long getSequence(long forWritePosition) {
 
         // the below cast is safe as cycleMask always returns a number guaranteed within int range
         int writePositionCycle = (int) cycleMask(forWritePosition);
-        final int lowerBitsOfWp = toLowerBitsWritePosition(toLongValue(writePositionCycle, 0));
-        final int toLowerBitsWritePosition = toLowerBitsWritePosition(cycleMask(sequenceValue));
+        final long lowerBitsOfWp = toLowerBitsWritePosition(toLongValue(writePositionCycle, 0));
+        final long toLowerBitsWritePosition = toLowerBitsWritePosition(cycleMask(sequenceValue));
 
         if (lowerBitsOfWp == toLowerBitsWritePosition)
             return toSequenceNumber(sequenceValue);
@@ -71,16 +70,16 @@ private long cycleMask(long number) {
         return number & THIRTY_ONE_BITS;
     }
 
-    private long toLongValue(int cycle, long sequenceNumber) {
-        return ((long) cycle << cycleShift) + (sequenceNumber & sequenceMask);
+    private long toLongValue(long cycle, long sequenceNumber) {
+        return (cycle << cycleShift) + (sequenceNumber & sequenceMask);
     }
 
     public long toSequenceNumber(long index) {
         return index & sequenceMask;
     }
 
-    private int toLowerBitsWritePosition(long index) {
-        return toCycle(index);
+    private long toLowerBitsWritePosition(long index) {
+        return index >> cycleShift;
     }
 
     private int toCycle(long number) {

diff --git a/src/test/java/net/openhft/chronicle/queue/impl/single/RollCycleEncodeSequenceTest.java b/src/test/java/net/openhft/chronicle/queue/impl/single/RollCycleEncodeSequenceTest.java
@@ -27,7 +27,7 @@ public static Collection<Object[]> data() {
                 {RollCycles.DAILY},
                 {RollCycles.HOURLY},
                 {RollCycles.MINUTELY},
-                //{RollCycles.HUGE_DAILY} java.lang.IllegalArgumentException: Unsigned Int 31-bit -13228 out of range
+                {RollCycles.HUGE_DAILY}
         });
     }