Fix potential race condition

burmanm · Jun 28, 2017 · e80a48b · e80a48b
1 parent 6b37038
commit e80a48b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 34 deletions.
diff --git a/src/main/java/fi/iki/yak/ts/compression/gorilla/Decompressor.java b/src/main/java/fi/iki/yak/ts/compression/gorilla/Decompressor.java
@@ -53,7 +53,6 @@ private void next() {
             storedTimestamp = blockTimestamp + storedDelta;
         } else {
             nextTimestamp();
-            nextValue();
         }
     }
 
@@ -106,6 +105,7 @@ private void nextTimestamp() {
 
         storedDelta = storedDelta + deltaDelta;
         storedTimestamp = storedDelta + storedTimestamp;
+        nextValue();
     }
 
     private void nextValue() {

diff --git a/src/main/java/fi/iki/yak/ts/compression/gorilla/GorillaDecompressor.java b/src/main/java/fi/iki/yak/ts/compression/gorilla/GorillaDecompressor.java
@@ -51,7 +51,6 @@ private void next() {
         }
 
         nextTimestamp();
-        nextValue();
     }
 
     private void first() {
@@ -73,6 +72,7 @@ private void nextTimestamp() {
         switch(readInstruction) {
             case 0x00:
                 storedTimestamp = storedDelta + storedTimestamp;
+                nextValue();
                 return;
             case 0x02:
                 deltaDelta = in.getLong(7);
@@ -101,6 +101,7 @@ private void nextTimestamp() {
         storedDelta = storedDelta + deltaDelta;
 
         storedTimestamp = storedDelta + storedTimestamp;
+        nextValue();
     }
 
     private void nextValue() {

diff --git a/src/test/java/fi/iki/yak/ts/compression/gorilla/EncodeTest.java b/src/test/java/fi/iki/yak/ts/compression/gorilla/EncodeTest.java
@@ -182,9 +182,6 @@ void testEmptyBlock() throws Exception {
         assertNull(d.readPair());
     }
 
-    /**
-     * Long values should be compressable and decompressable in the stream
-     */
     @Test
     void testLongEncoding() throws Exception {
         // This test should trigger ByteBuffer reallocation
@@ -228,33 +225,4 @@ void testLongEncoding() throws Exception {
         }
         assertNull(d.readPair());
     }
-
-    @Test
-    void testIssue11() {
-        long now = System.currentTimeMillis();
-        LongArrayOutput output = new LongArrayOutput(500);
-        GorillaCompressor c = new GorillaCompressor(LocalDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.HOURS).
-                toInstant(ZoneOffset.UTC).toEpochMilli(), output);
-
-        Map<Long, Double> dps = new TreeMap<>();
-        int n = 3600;
-        Random r = new Random();
-        for(int i=0; i<n; i++) {
-            dps.put(now + (1000 * i) + r.nextInt(100), 100.0);
-        }
-
-        for(Map.Entry<Long, Double> entry : dps.entrySet()) {
-            c.addValue(entry.getKey(), entry.getValue());
-        }
-        c.close();
-
-        LongArrayInput input = new LongArrayInput(output.getLongArray());
-        GorillaDecompressor dc = new GorillaDecompressor(input);
-
-        Pair pair = dc.readPair();
-        while(pair != null) {
-            assertTrue(dps.containsKey(pair.getTimestamp()), "Datapoint was missing");
-            pair = dc.readPair();
-        }
-    }
 }