From 62437f384f655c6e86691d45addcb3a590147ea6 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 30 Dec 2016 13:16:30 +0100 Subject: [PATCH] minor unimportant changes --- .../java/org/lucares/recommind/logs/TcpIngestor.java | 2 +- .../java/org/lucares/performance/db/PerformanceDb.java | 9 +++++++-- .../src/main/java/org/lucares/performance/db/Stats.java | 1 + .../main/java/org/lucares/performance/db/TagsToFile.java | 4 ---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/TcpIngestor.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/TcpIngestor.java index 502022c..4b60595 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/TcpIngestor.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/TcpIngestor.java @@ -155,7 +155,7 @@ public class TcpIngestor implements AutoCloseable { public void start() throws Exception { - final ArrayBlockingQueue queue = new ArrayBlockingQueue<>(100); + final ArrayBlockingQueue queue = new ArrayBlockingQueue<>(1); serverThreadPool.submit(() -> { Thread.currentThread().setName("db-ingestion"); diff --git a/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java b/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java index ca41639..d7ad7e2 100644 --- a/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java +++ b/performanceDb/src/main/java/org/lucares/performance/db/PerformanceDb.java @@ -57,7 +57,7 @@ public class PerformanceDb implements AutoCloseable { public void put(final BlockingIterator entries) throws WriteException { - final int blocksize = 10000; + final int blocksize = 100000; long count = 0; try { @@ -83,7 +83,8 @@ public class PerformanceDb implements AutoCloseable { final long end = System.nanoTime(); final double duration = (end - start) / 1_000_000.0; LOGGER.info("inserting the last " + blocksize + " took " + duration + " ms; " + Stats.duration - + "ms of " + Stats.count + " operations. total entries: " + count); + + "ms of " + Stats.count + " operations. total entries: " + count / 1_000_000.0 + + " million"); // System.out.println(entry); @@ -91,6 +92,10 @@ public class PerformanceDb implements AutoCloseable { Stats.duration = 0.0; Stats.count = 0; } + + if (count % blocksize == 0) { + tagsToFile.flush(); + } } } catch (final RuntimeException e) { diff --git a/performanceDb/src/main/java/org/lucares/performance/db/Stats.java b/performanceDb/src/main/java/org/lucares/performance/db/Stats.java index 955357f..de17562 100644 --- a/performanceDb/src/main/java/org/lucares/performance/db/Stats.java +++ b/performanceDb/src/main/java/org/lucares/performance/db/Stats.java @@ -9,5 +9,6 @@ public class Stats { final long s = System.nanoTime(); final long e = System.nanoTime(); Stats.duration += (e - s) / 1_000_000.0; + Stats.count++; } } diff --git a/performanceDb/src/main/java/org/lucares/performance/db/TagsToFile.java b/performanceDb/src/main/java/org/lucares/performance/db/TagsToFile.java index ee9ed12..c09d15a 100644 --- a/performanceDb/src/main/java/org/lucares/performance/db/TagsToFile.java +++ b/performanceDb/src/main/java/org/lucares/performance/db/TagsToFile.java @@ -161,15 +161,11 @@ public class TagsToFile implements CollectionUtils, AutoCloseable { final PdbWriter result; final WriterCache writersForTags = getOrInit(tags); - final long s = System.nanoTime(); final Optional optionalWriter = chooseBestMatchingWriter(writersForTags.getWriters(), date); - final long e = System.nanoTime(); - Stats.duration += (e - s) / 1_000_000.0; if (optionalWriter.isPresent()) { result = optionalWriter.get(); } else { - Stats.count++; final List pdbFiles = getFilesMatchingTagsExactly(tags); assertAllFilesHaveSameFolder(pdbFiles);