Repository: jena Updated Branches: refs/heads/master 0e904ec4e -> 3b7e8b978
Tidy up. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0dbc1c2b Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0dbc1c2b Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0dbc1c2b Branch: refs/heads/master Commit: 0dbc1c2b346f0ed5af73658c9dd0bdf50b3e8bac Parents: 21c9763 Author: Andy Seaborne <[email protected]> Authored: Sat Oct 6 19:14:59 2018 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Oct 8 13:02:05 2018 +0100 ---------------------------------------------------------------------- .../apache/jena/tdb2/loader/base/LoaderOps.java | 2 +- .../tdb2/loader/base/ProgressMonitorOutput.java | 34 +++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/0dbc1c2b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderOps.java ---------------------------------------------------------------------- diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderOps.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderOps.java index bb6b16b..88b95b7 100644 --- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderOps.java +++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/LoaderOps.java @@ -78,7 +78,7 @@ public class LoaderOps { return new ProgressStreamRDF(dest, monitor); } - /** Calculate a label for a progress montior. */ + /** Calculate a label for a progress monitor. */ private static String label(String fileName) { String basename = FileOps.splitDirFile(fileName).get(1); return basename; http://git-wip-us.apache.org/repos/asf/jena/blob/0dbc1c2b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressMonitorOutput.java ---------------------------------------------------------------------- diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressMonitorOutput.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressMonitorOutput.java index 9f498ae..9720069 100644 --- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressMonitorOutput.java +++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/loader/base/ProgressMonitorOutput.java @@ -34,10 +34,14 @@ public class ProgressMonitorOutput implements ProgressMonitor { private final long tickPoint; private final int superTick; private final Timer timer; + private Timer getTimer() { return timer; } + private final String label; + // Counters - this monitor. private long counterBatch = 0; private long counterTotal = 0; + //private final ProgressMonitorContext context; private long lastTime = -1; private long timeTotalMillis = -1; @@ -92,27 +96,29 @@ public class ProgressMonitorOutput implements ProgressMonitor { @Override public void finishMessage(String msg) { // Elapsed. - long timePoint = timer.getTimeInterval(); + long timePoint = getTimer().getTimeInterval(); + long counterTotalMsg = getRunningTotal(); // /1000L is milli to second conversion if ( timePoint != 0 ) { double time = timePoint / 1000.0; - long runAvgRate = (counterTotal * 1000L) / timePoint; + long runAvgRate = (counterTotalMsg * 1000L) / timePoint; - print("%s: %,d %s %.2fs (Avg: %,d)", msg, counterTotal, label, time, runAvgRate); + print("%s: %,d %s %.2fs (Avg: %,d)", msg, counterTotalMsg, label, time, runAvgRate); } else - print("%s: %,d %s (Avg: ----)", msg, counterTotal, label); + print("%s: %,d %s (Avg: ----)", msg, counterTotalMsg, label); } @Override public void start() { - timer.startTimer(); + // XXX + getTimer().startTimer(); lastTime = 0; } @Override public void finish() { - timeTotalMillis = timer.endTimer(); + timeTotalMillis = getTimer().endTimer(); } @Override @@ -120,22 +126,22 @@ public class ProgressMonitorOutput implements ProgressMonitor { counterBatch++; counterTotal++; - if ( tickPoint(counterTotal, tickPoint) ) { - long timePoint = timer.readTimer(); + if ( tickPoint(getRunningTotal(), tickPoint) ) { + long timePoint = getTimer().readTimer(); long thisTime = timePoint - lastTime; // *1000L is milli to second conversion if ( thisTime != 0 && timePoint != 0 ) { long batchAvgRate = (counterBatch * 1000L) / thisTime; - long runAvgRate = (counterTotal * 1000L) / timePoint; - print("Add: %,d %s (Batch: %,d / Avg: %,d)", counterTotal, label, batchAvgRate, runAvgRate); + long runAvgRate = (getRunningTotal() * 1000L) / timePoint; + print("Add: %,d %s (Batch: %,d / Avg: %,d)", getRunningTotal(), label, batchAvgRate, runAvgRate); } else { - print("Add: %,d %s (Batch: ---- / Avg: ----)", counterTotal, label); + print("Add: %,d %s (Batch: ---- / Avg: ----)", getRunningTotal(), label); } lastTime = timePoint; - if ( tickPoint(counterTotal, superTick * tickPoint) ) + if ( tickPoint(getRunningTotal(), superTick * tickPoint) ) elapsed(timePoint); counterBatch = 0; lastTime = timePoint; @@ -147,6 +153,10 @@ public class ProgressMonitorOutput implements ProgressMonitor { return counterTotal; } + private long getRunningTotal() { + return counterTotal; + } + @Override public long getTime() { return timeTotalMillis;
