QUEUE-14 now forcibly deleting files once they are used

OpenHFT · Feb 11, 2015 · 89e62eb · 89e62eb
1 parent 0be211d
commit 89e62eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/chronicle-queue/src/test/java/net/openhft/chronicle/queue/ChronicleQueueTest.java b/chronicle-queue/src/test/java/net/openhft/chronicle/queue/ChronicleQueueTest.java
@@ -24,10 +24,13 @@ public void testCreateAppender() throws Exception {
         for (int r = 0; r < 2; r++) {
             for (int t = 1; t <= Runtime.getRuntime().availableProcessors(); t++) {
                 List<Future<?>> futureList = new ArrayList<>();
+                List<File> files = new ArrayList<>();
                 long start = System.nanoTime();
                 for (int j = 0; j < 4; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
-                    new File(name).deleteOnExit();
+                    File file = new File(name);
+                    files.add(file);
+                    file.deleteOnExit();
                     ChronicleQueue chronicle = new ChronicleQueueBuilder(name).build();
 
                     futureList.add(ForkJoinPool.commonPool().submit(() -> {
@@ -55,6 +58,9 @@ public void testCreateAppender() throws Exception {
                 }
                 long end = System.nanoTime();
                 System.out.printf("Threads: %,d - Write rate %.1f M/s - Read rate %.1f M/s%n", t, t * RUNS * 1e3 / (mid - start), t * RUNS * 1e3 / (end - mid));
+                for (File f : files) {
+                    f.delete();
+                }
             }
         }
     }

diff --git a/...nicle-queue/src/test/java/net/openhft/chronicle/queue/DirectChronicleQueueStringTest.java b/...nicle-queue/src/test/java/net/openhft/chronicle/queue/DirectChronicleQueueStringTest.java
@@ -43,10 +43,14 @@ public void testCreateAppender() throws Exception {
         for (int r = 0; r < 2; r++) {
             for (int t = 1; t < Runtime.getRuntime().availableProcessors(); t++) {
                 List<Future<?>> futureList = new ArrayList<>();
+
+                List<File> files = new ArrayList<>();
                 long start = System.nanoTime();
                 for (int j = 0; j < t; j++) {
                     String name = TMP + "/single" + start + "-" + j + ".q";
-                    new File(name).deleteOnExit();
+                    File file = new File(name);
+                    file.deleteOnExit();
+                    files.add(file);
                     DirectChronicleQueue chronicle = (DirectChronicleQueue) new ChronicleQueueBuilder(name)
                             .build();
 
@@ -76,6 +80,9 @@ public void testCreateAppender() throws Exception {
                 }
                 long end = System.nanoTime();
                 System.out.printf("Threads: %,d - Write rate %.1f M/s - Read rate %.1f M/s%n", t, t * RUNS * 1e3 / (mid - start), t * RUNS * 1e3 / (end - mid));
+                for (File f : files) {
+                    f.delete();
+                }
             }
         }
     }

diff --git a/chronicle-queue/src/test/java/simple/WriterMain.java b/chronicle-queue/src/test/java/simple/WriterMain.java
@@ -32,6 +32,7 @@ public static void main(String[] args) throws IOException {
                 count++;
             }
             file.close();
+            tmpFile.delete();
             long time = System.nanoTime() - start;
             System.out.printf("%,d in %.3f secs, throughput %.6f M/s x %,d%n", count, time / 1e9, count * 1e3 / time, length);
         }