You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/03/05 14:51:52 UTC
jena git commit: Add ProcesssMonitor.create Logger.
Repository: jena
Updated Branches:
refs/heads/master 050c09cb3 -> b46ba975f
Add ProcesssMonitor.create Logger.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b46ba975
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b46ba975
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b46ba975
Branch: refs/heads/master
Commit: b46ba975feec62aa4d1493ee8c2a0b272208de34
Parents: 050c09c
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 5 13:47:29 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Mar 5 13:48:42 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/lib/ProgressMonitor.java | 12 ++++++++++++
.../org/apache/jena/atlas/logging/ProgressLogger.java | 2 +-
.../jena/tdb/store/bulkloader2/ProcIndexCopy.java | 4 ++--
.../tdb/store/bulkloader2/ProcNodeTableBuilder.java | 8 ++++----
4 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b46ba975/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java
index ffe2c21..46ab7f5 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.lib;
import static org.apache.jena.atlas.lib.DateTimeUtils.nowAsString ;
import org.apache.jena.atlas.lib.Timer;
+import org.slf4j.Logger ;
/** Progress monitor - output lines to show the progress of some long running operation.
* This is based on "ticks", not time.
@@ -43,6 +44,17 @@ public class ProgressMonitor {
private long lastTime = 0;
+ /** ProgressMonitor that outputs to a {@link Logger} */
+ public static ProgressMonitor create(Logger log, String label, long tickPoint, int superTick) {
+ Output outputToLog = (fmt, args)-> {
+ if ( log != null && log.isInfoEnabled() ) {
+ String str = String.format(fmt, args);
+ log.info(str);
+ }
+ } ;
+ return new ProgressMonitor(label, tickPoint, superTick, outputToLog) ;
+ }
+
/**
* @param label
* Label added to output strings.
http://git-wip-us.apache.org/repos/asf/jena/blob/b46ba975/jena-base/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
index 92d3aca..42adcb2 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
@@ -22,7 +22,7 @@ import org.apache.jena.atlas.lib.ProgressMonitor ;
import org.slf4j.Logger ;
/**
- * @deprecated Use ProgressMonitor.
+ * @deprecated Use {@link ProgressMonitor#create}. This class will be removed.
*/
@Deprecated
public class ProgressLogger extends ProgressMonitor
http://git-wip-us.apache.org/repos/asf/jena/blob/b46ba975/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcIndexCopy.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcIndexCopy.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcIndexCopy.java
index 831dd3c..f64c5fb 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcIndexCopy.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcIndexCopy.java
@@ -21,8 +21,8 @@ package org.apache.jena.tdb.store.bulkloader2;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.DateTimeUtils ;
+import org.apache.jena.atlas.lib.ProgressMonitor ;
import org.apache.jena.atlas.lib.tuple.Tuple ;
-import org.apache.jena.atlas.logging.ProgressLogger ;
import org.apache.jena.tdb.base.file.Location ;
import org.apache.jena.tdb.setup.Build ;
import org.apache.jena.tdb.store.NodeId ;
@@ -71,7 +71,7 @@ public class ProcIndexCopy
}
private static void tupleIndexCopy(TupleIndex index1, TupleIndex index2, String label) {
- ProgressLogger monitor = new ProgressLogger(log, label, tickQuantum, superTick);
+ ProgressMonitor monitor = ProgressMonitor.create(log, label, tickQuantum, superTick);
monitor.start();
Iterator<Tuple<NodeId>> iter1 = index1.all();
http://git-wip-us.apache.org/repos/asf/jena/blob/b46ba975/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcNodeTableBuilder.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcNodeTableBuilder.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcNodeTableBuilder.java
index d906651..fd6533b 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcNodeTableBuilder.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/ProcNodeTableBuilder.java
@@ -26,7 +26,7 @@ import java.util.List ;
import org.apache.jena.atlas.AtlasException ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.DateTimeUtils ;
-import org.apache.jena.atlas.logging.ProgressLogger ;
+import org.apache.jena.atlas.lib.ProgressMonitor ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.riot.RDFDataMgr ;
@@ -59,7 +59,7 @@ public class ProcNodeTableBuilder {
dsg.getTripleTable().getNodeTupleTable().getTupleTable().close();
dsg.getQuadTable().getNodeTupleTable().getTupleTable().close();
- ProgressLogger monitor = new ProgressLogger(cmdLog, "Data", BulkLoader.DataTickPoint, BulkLoader.superTick) ;
+ ProgressMonitor monitor = ProgressMonitor.create(cmdLog, "Data", BulkLoader.DataTickPoint, BulkLoader.superTick) ;
OutputStream outputTriples = null ;
OutputStream outputQuads = null ;
@@ -103,10 +103,10 @@ public class ProcNodeTableBuilder {
private NodeTable nodeTable ;
private WriteRows writerTriples ;
private WriteRows writerQuads ;
- private ProgressLogger monitor ;
+ private ProgressMonitor monitor ;
private StatsCollectorNodeId stats ;
- NodeTableBuilder(DatasetGraphTDB dsg, ProgressLogger monitor, OutputStream outputTriples, OutputStream outputQuads, boolean collectStats)
+ NodeTableBuilder(DatasetGraphTDB dsg, ProgressMonitor monitor, OutputStream outputTriples, OutputStream outputQuads, boolean collectStats)
{
this.dsg = dsg ;
this.monitor = monitor ;