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 2013/09/18 10:59:27 UTC
svn commit: r1524340 - in /jena/trunk/jena-tdb/src/main/java:
com/hp/hpl/jena/tdb/store/bulkloader/
com/hp/hpl/jena/tdb/store/bulkloader2/ tdb/cmdline/
Author: andy
Date: Wed Sep 18 08:59:27 2013
New Revision: 1524340
URL: http://svn.apache.org/r1524340
Log:
Tidy upo and use ARQ version of ProgressLogger
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/ProgressLogger.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java?rev=1524340&r1=1524339&r2=1524340&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java Wed Sep 18 08:59:27 2013
@@ -29,6 +29,8 @@ import com.hp.hpl.jena.sparql.util.Timer
public final class LoadMonitor
{
+ // c.f. ProgressLogger except this (earlier) class
+ // has two explicit phases.
/* Parameterize the load logging */
private final Logger log ;
private final DatasetGraph dataset ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java?rev=1524340&r1=1524339&r2=1524340&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java Wed Sep 18 08:59:27 2013
@@ -25,6 +25,7 @@ import java.util.Iterator ;
import org.apache.jena.atlas.lib.Bytes ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.ProgressLogger ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import tdb.cmdline.CmdTDB ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java?rev=1524340&r1=1524339&r2=1524340&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java Wed Sep 18 08:59:27 2013
@@ -32,6 +32,7 @@ import org.apache.jena.atlas.lib.FileOps
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.ProgressLogger ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.RiotReader ;
Modified: jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java?rev=1524340&r1=1524339&r2=1524340&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java Wed Sep 18 08:59:27 2013
@@ -36,35 +36,9 @@ public abstract class CmdTDB extends Cmd
{
protected final ModTDBDataset tdbDatasetAssembler = new ModTDBDataset() ;
- // Check oK - remove.
-// private static final String log4Jsetup = StrUtils.strjoin("\n"
-// , "## Plain output to stdout"
-// , "log4j.appender.tdb.plain=org.apache.log4j.ConsoleAppender"
-// , "log4j.appender.tdb.plain.target=System.out"
-// , "log4j.appender.tdb.plain.layout=org.apache.log4j.PatternLayout"
-// , "log4j.appender.tdb.plain.layout.ConversionPattern=%m%n"
-//
-// , "## Plain output with level, to stderr"
-// , "log4j.appender.tdb.plainlevel=org.apache.log4j.ConsoleAppender"
-// , "log4j.appender.tdb.plainlevel.target=System.err"
-// , "log4j.appender.tdb.plainlevel.layout=org.apache.log4j.PatternLayout"
-// , "log4j.appender.tdb.plainlevel.layout.ConversionPattern=%-5p %m%n"
-//
-// , "## Everything"
-// , "log4j.rootLogger=INFO, tdb.plainlevel"
-//
-// , "## Loader output"
-// , "log4j.additivity."+TDB.logLoaderName+"=false"
-// , "log4j.logger."+TDB.logLoaderName+"=INFO, tdb.plain"
-//
-// , "## Parser output"
-// , "log4j.additivity."+SysRIOT.riotLoggerName+"=false"
-// , "log4j.logger."+SysRIOT.riotLoggerName+"=INFO, tdb.plainlevel "
-// ) ;
private static boolean initialized = false ;
- protected CmdTDB(String[] argv)
- {
+ protected CmdTDB(String[] argv) {
super(argv) ;
init() ;
super.addModule(tdbDatasetAssembler) ;
@@ -72,10 +46,9 @@ public abstract class CmdTDB extends Cmd
super.modVersion.addClass(ARQ.class) ;
super.modVersion.addClass(TDB.class) ;
}
-
- public static synchronized void init()
- {
- if ( initialized )
+
+ public static synchronized void init() {
+ if (initialized)
return ;
// attempt once.
initialized = true ;
@@ -83,38 +56,31 @@ public abstract class CmdTDB extends Cmd
TDB.init() ;
DatasetBuilderStd.setOptimizerWarningFlag(false) ;
}
-
+
@Override
- protected void processModulesAndArgs()
- {
+ protected void processModulesAndArgs() {
super.processModulesAndArgs() ;
}
-
- protected Location getLocation()
- {
+
+ protected Location getLocation() {
return tdbDatasetAssembler.getLocation() ;
}
-
- protected DatasetGraph getDatasetGraph()
- {
+
+ protected DatasetGraph getDatasetGraph() {
return getDataset().asDatasetGraph() ;
}
-
- protected DatasetGraphTDB getDatasetGraphTDB()
- {
+
+ protected DatasetGraphTDB getDatasetGraphTDB() {
DatasetGraph dsg = getDatasetGraph() ;
return TDBInternal.getBaseDatasetGraphTDB(dsg) ;
}
- protected Dataset getDataset()
- {
+ protected Dataset getDataset() {
return tdbDatasetAssembler.getDataset() ;
}
-
+
@Override
- protected String getCommandName()
- {
+ protected String getCommandName() {
return Utils.className(this) ;
}
-
}