improve last indexfile lookup

OpenHFT · Apr 8, 2015 · 031d4ea · 031d4ea
1 parent bbbd3ed
commit 031d4ea
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/chronicle/src/main/java/net/openhft/chronicle/ChronicleQueueBuilder.java b/chronicle/src/main/java/net/openhft/chronicle/ChronicleQueueBuilder.java
@@ -563,6 +563,7 @@ public VanillaChronicleQueueBuilder clone() {
     public static abstract class ReplicaChronicleQueueBuilder extends ChronicleQueueBuilder
             implements MappingProvider<ReplicaChronicleQueueBuilder> {
 
+        public static final int DEFAULT_SOCKET_BUFFER_SIZE = 256 * 1024;
         public static final TcpConnectionListener CONNECTION_LISTENER = new TcpConnectionHandler();
 
         private final ChronicleQueueBuilder builder;
@@ -616,9 +617,9 @@ private ReplicaChronicleQueueBuilder(Chronicle chronicle, ChronicleQueueBuilder
             this.selectTimeoutUnit = TimeUnit.MILLISECONDS;
             this.heartbeatInterval = 2500;
             this.heartbeatIntervalUnit = TimeUnit.MILLISECONDS;
-            this.receiveBufferSize = 256 * 1024;
+            this.receiveBufferSize = DEFAULT_SOCKET_BUFFER_SIZE;
-            this.sendBufferSize = -1;
+            this.sendBufferSize = DEFAULT_SOCKET_BUFFER_SIZE;
-            this.minBufferSize = this.receiveBufferSize;
+            this.minBufferSize = DEFAULT_SOCKET_BUFFER_SIZE;
             this.sharedChronicle = false;
             this.acceptorMaxBacklog = 50;
             this.acceptorDefaultThreads = 0;

diff --git a/chronicle/src/main/java/net/openhft/chronicle/VanillaChronicle.java b/chronicle/src/main/java/net/openhft/chronicle/VanillaChronicle.java
@@ -516,7 +516,7 @@ private class VanillaAppenderImpl extends AbstractVanillaExcerpt implements Vani
         private boolean nextSynchronous;
         private long lastWrittenIndex;
         private long[] positionArr = {0L};
-        private int dataCount;
+        private int lastDataIndex;
 
         public VanillaAppenderImpl() {
             this.lastCycle = Integer.MIN_VALUE;
@@ -525,7 +525,7 @@ public VanillaAppenderImpl() {
             this.appenderCycle = -1;
             this.appenderThreadId = -1;
             this.nextSynchronous = builder.synchronous();
-            this.dataCount = 0;
+            this.lastDataIndex = 0;
         }
 
         @Override
@@ -560,16 +560,14 @@ public void startExcerpt(long capacity, int cycle) {
                     lastThreadId = appenderThreadId;
                 }
 
-                if (dataBytes == null || indexBytes == null) {
+                if (dataBytes == null) {
-                    dataCount = dataCache.findNextDataCount(appenderCycle, appenderThreadId);
+                    lastDataIndex = dataCache.findNextDataCount(appenderCycle, appenderThreadId);
-                    dataBytes = dataCache.dataFor(appenderCycle, appenderThreadId, dataCount, true);
+                    dataBytes = dataCache.dataFor(appenderCycle, appenderThreadId, lastDataIndex, true);
                 }
 
                 if (dataBytes.remaining() < capacity + 4) {
                     dataBytes.release();
-                    dataBytes = null;
+                    dataBytes = dataCache.dataFor(appenderCycle, appenderThreadId, ++lastDataIndex, true);
-                    dataCount++;
-                    dataBytes = dataCache.dataFor(appenderCycle, appenderThreadId, dataCount, true);
                 }
 
                 startAddr = positionAddr = dataBytes.positionAddr() + 4;
@@ -598,8 +596,10 @@ public void nextSynchronous(boolean nextSynchronous) {
         }
         @Override
         public void finish() {
-            if (finished)
+            if (finished) {
                 throw new IllegalStateException("Not started");
+            }
+
             super.finish();
             if (dataBytes == null) {
                 return;
@@ -615,20 +615,17 @@ public void finish() {
 
             try {
                 long position = VanillaIndexCache.append(indexBytes, indexValue, nextSynchronous);
-                long lvindex = -1;
                 if (position < 0) {
                     if (indexBytes != null) {
                         indexBytes.release();
                         indexBytes = null;
                     }
 
                     indexBytes = indexCache.append(appenderCycle, indexValue, nextSynchronous, positionArr);
-                    lvindex = indexFrom(appenderCycle, indexBytes.index(), positionArr[0]);
+                    setLastWrittenIndex(indexFrom(appenderCycle, indexBytes.index(), positionArr[0]));
                 } else {
-                    lvindex = indexFrom(appenderCycle, indexBytes.index(), position);
+                    setLastWrittenIndex(indexFrom(appenderCycle, indexBytes.index(), position));
                 }
-
-                setLastWrittenIndex(lvindex);
             } catch (IOException e) {
                 throw new AssertionError(e);
             }

diff --git a/chronicle/src/main/java/net/openhft/chronicle/VanillaDataCache.java b/chronicle/src/main/java/net/openhft/chronicle/VanillaDataCache.java
@@ -138,8 +138,9 @@ public int findNextDataCount(int cycle, int threadId) throws IOException {
             for (File file : files) {
                 if (file.getName().startsWith(dataPrefix)) {
                     final int count = Integer.parseInt(file.getName().substring(dataPrefix.length()));
-                    if (maxCount < count)
+                    if (maxCount < count) {
                         maxCount = count;
+                    }
                 }
             }
         }

diff --git a/chronicle/src/main/java/net/openhft/chronicle/VanillaIndexCache.java b/chronicle/src/main/java/net/openhft/chronicle/VanillaIndexCache.java
@@ -140,6 +140,11 @@ public synchronized void close() {
         this.cache.close();
     }
 
+    int lastIndexFile() {
+        int lastCycle = (int)lastCycle();
+        return lastIndexFile(lastCycle);
+    }
+
     int lastIndexFile(int cycle) {
         return lastIndexFile(cycle, 0);
     }
@@ -212,15 +217,17 @@ public synchronized VanillaMappedBytes append(
 
     public long firstCycle() {
         File[] files = baseFile.listFiles();
-        if (files == null)
+        if (files == null) {
             return -1;
+        }
 
         long firstDate = Long.MAX_VALUE;
         for (File file : files) {
             try {
                 long date = dateCache.parseCount(file.getName());
-                if (firstDate > date)
+                if (firstDate > date) {
                     firstDate = date;
+                }
             } catch (ParseException ignored) {
                 // ignored
             }