Author: andy
Date: Mon Aug 4 10:30:16 2014
New Revision: 1615527
URL: http://svn.apache.org/r1615527
Log:
JENA-757 : Do less checking of triples vs quads on input URLs before using
them. Assume conneg will work out.
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java?rev=1615527&r1=1615526&r2=1615527&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java
(original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBLoader.java Mon
Aug 4 10:30:16 2014
@@ -22,8 +22,6 @@ import java.io.InputStream ;
import java.util.ArrayList ;
import java.util.List ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.graph.Node ;
@@ -227,18 +225,7 @@ public class TDBLoader
// public final void setLogger(Logger log)
// { this.loaderLog = log ; }
- private static void loadGraph$(GraphTDB graph, List<String> urls, boolean
showProgress)
- {
- if ( false )
- {
- for ( String url : urls )
- {
- Lang lang = RDFLanguages.filenameToLang(url) ;
- if ( lang != null && RDFLanguages.isQuads(lang) )
- throw new TDBException("Not a triples language") ;
- }
- }
-
+ private static void loadGraph$(GraphTDB graph, List<String> urls, boolean
showProgress) {
if ( graph.getGraphName() == null )
loadDefaultGraph$(graph.getDSG(), urls, showProgress) ;
else
@@ -247,50 +234,39 @@ public class TDBLoader
// These are the basic operations for TDBLoader.
- private static void loadGraph$(GraphTDB graph, InputStream input, boolean
showProgress)
- {
+ private static void loadGraph$(GraphTDB graph, InputStream input, boolean
showProgress) {
if ( graph.getGraphName() == null )
loadDefaultGraph$(graph.getDSG(), input, showProgress) ;
else
loadNamedGraph$(graph.getDSG(), graph.getGraphName(), input,
showProgress) ;
}
- private static void loadDefaultGraph$(DatasetGraphTDB dataset,
List<String> urls, boolean showProgress)
- {
+ private static void loadDefaultGraph$(DatasetGraphTDB dataset,
List<String> urls, boolean showProgress) {
BulkLoader.loadDefaultGraph(dataset, urls, showProgress) ;
}
- private static void loadDefaultGraph$(DatasetGraphTDB dataset, InputStream
input, boolean showProgress)
- {
+ private static void loadDefaultGraph$(DatasetGraphTDB dataset, InputStream
input, boolean showProgress) {
BulkLoader.loadDefaultGraph(dataset, input, showProgress) ;
}
- private static void loadNamedGraph$(DatasetGraphTDB dataset, Node
graphName, List<String> urls, boolean showProgress)
- {
+ private static void loadNamedGraph$(DatasetGraphTDB dataset, Node
graphName, List<String> urls, boolean showProgress) {
BulkLoader.loadNamedGraph(dataset, graphName, urls, showProgress) ;
}
- private static void loadNamedGraph$(DatasetGraphTDB dataset, Node
graphName, InputStream input, boolean showProgress)
- {
- //N-Triples
+ private static void loadNamedGraph$(DatasetGraphTDB dataset, Node
graphName, InputStream input, boolean showProgress) {
BulkLoader.loadNamedGraph(dataset, graphName, input, showProgress) ;
}
- private static void loadDataset$(DatasetGraphTDB dataset, List<String>
urls, boolean showProgress)
- {
- //N-Quads
+ private static void loadDataset$(DatasetGraphTDB dataset, List<String>
urls, boolean showProgress) {
BulkLoader.loadDataset(dataset, urls, showProgress) ;
}
- private static void loadDataset$(DatasetGraphTDB dataset, InputStream
input, boolean showProgress)
- {
- //N-Quads
+ private static void loadDataset$(DatasetGraphTDB dataset, InputStream
input, boolean showProgress) {
BulkLoader.loadDataset(dataset, input, showProgress) ;
}
-
- /** Load any model, not necessarily efficiently. */
- private static void loadAnything(Model model, String url, boolean
showProgress)
- {
+
+ /** Load any model, not necessarily efficiently. */
+ private static void loadAnything(Model model, String url, boolean
showProgress) {
model.read(url) ;
}
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java?rev=1615527&r1=1615526&r2=1615527&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java Mon Aug 4 10:30:16
2014
@@ -24,7 +24,6 @@ import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
import tdb.cmdline.CmdTDB ;
import tdb.cmdline.CmdTDBGraph ;
-import tdb.cmdline.ModModel ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.tdb.TDB ;
@@ -32,19 +31,12 @@ import com.hp.hpl.jena.tdb.TDBLoader ;
import com.hp.hpl.jena.tdb.store.GraphTDB ;
public class tdbloader extends CmdTDBGraph {
- // private static final ArgDecl argParallel = new ArgDecl(ArgDecl.NoValue,
- // "parallel") ;
- // private static final ArgDecl argIncremental = new
- // ArgDecl(ArgDecl.NoValue, "incr", "incremental") ;
+ // private static final ArgDecl argParallel = new ArgDecl(ArgDecl.NoValue,
"parallel") ;
+ // private static final ArgDecl argIncremental = new
ArgDecl(ArgDecl.NoValue, "incr", "incremental") ;
- private static final ModModel modRDFS = new ModModel("rdfs") ;
-
- // private String rdfsVocabFilename = null ;
- // private Model rdfsVocab = null ;
-
- private boolean showProgress = true ;
+ private boolean showProgress = true ;
// private boolean doInParallel = false ;
- private boolean doIncremental = false ;
+ // private boolean doIncremental = false ;
static public void main(String... argv) {
CmdTDB.init() ;
@@ -54,7 +46,6 @@ public class tdbloader extends CmdTDBGra
protected tdbloader(String[] argv) {
super(argv) ;
-
// super.add(argParallel, "--parallel",
// "Do rebuilding of secondary indexes in a parallel") ;
// super.add(argIncremental, "--incremental",
@@ -91,53 +82,31 @@ public class tdbloader extends CmdTDBGra
if ( urls.size() == 0 )
urls.add("-") ;
- if ( modRDFS.getModel() != null ) {
- // TODO
- }
-
- boolean allTriples = true ;
- for ( String url : urls ) {
- Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQUADS) ;
- if ( lang != null && RDFLanguages.isQuads(lang) ) {
- allTriples = false ;
- break ;
- }
- }
-
- if ( allTriples && graphName == null ) {
- loadDefaultGraph(urls) ;
- return ;
- }
-
if ( graphName == null ) {
loadQuads(urls) ;
return ;
}
-
- // graphName != null
- if ( !allTriples ) {
- for ( String url : urls ) {
- Lang lang = RDFLanguages.filenameToLang(url,
RDFLanguages.NQUADS) ;
- if ( lang == null )
- // Does not happen due to default above.
- cmdError("File suffix not recognized: " + url) ;
- if ( lang != null && !RDFLanguages.isTriples(lang) )
- cmdError("Can only load triples into a named model: " +
url) ;
+
+ // There's a --graph.
+ // Check/warn that there are no quads formats mentioned
+ // (RIOT will take the default graph from quads).
+
+ for ( String url : urls ) {
+ Lang lang = RDFLanguages.filenameToLang(url) ;
+ if ( lang != null && RDFLanguages.isQuads(lang) ) {
+ System.err.println("Warning: Quads format given - only the
default graph is loaded into the graph for --graph") ;
+ break ;
}
- cmdError("Internal error: deteched quad input but can't find it
again") ;
- return ;
}
-
+
loadNamedGraph(urls) ;
}
- // RDFS
-
- void loadDefaultGraph(List<String> urls) {
- GraphTDB graph = getGraph() ;
- TDBLoader.load(graph, urls, showProgress) ;
- return ;
- }
+// void loadDefaultGraph(List<String> urls) {
+// GraphTDB graph = getGraph() ;
+// TDBLoader.load(graph, urls, showProgress) ;
+// return ;
+// }
void loadNamedGraph(List<String> urls) {
GraphTDB graph = getGraph() ;
