Author: andy
Date: Tue Jul 22 11:06:50 2014
New Revision: 1612543
URL: http://svn.apache.org/r1612543
Log:
JENA-749 : Remove tuples handling from StreamRDF interface.
See JIRA for patches that capture the changes as well.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java
(with props)
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java
(with props)
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java
(with props)
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamTuples.java
Modified:
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedQuadsStream.java
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedTriplesStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/StreamRDFCounting.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWrapper.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestStreamRDF.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
Modified:
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedQuadsStream.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedQuadsStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedQuadsStream.java
(original)
+++
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedQuadsStream.java
Tue Jul 22 11:06:50 2014
@@ -18,10 +18,8 @@
package org.apache.jena.hadoop.rdf.io.input.util;
-import org.apache.jena.atlas.lib.Tuple;
import org.apache.jena.riot.lang.PipedRDFIterator;
-import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -54,10 +52,4 @@ public class TrackedPipedQuadsStream ext
public void quad(Quad quad) {
this.receive(quad);
}
-
- @Override
- public void tuple(Tuple<Node> tuple) {
- // Tuples are discarded
- }
-
}
Modified:
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedTriplesStream.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedTriplesStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedTriplesStream.java
(original)
+++
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/util/TrackedPipedTriplesStream.java
Tue Jul 22 11:06:50 2014
@@ -18,10 +18,8 @@
package org.apache.jena.hadoop.rdf.io.input.util;
-import org.apache.jena.atlas.lib.Tuple;
import org.apache.jena.riot.lang.PipedRDFIterator;
-import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -55,9 +53,4 @@ public class TrackedPipedTriplesStream e
// Quads are discarded
}
- @Override
- public void tuple(Tuple<Node> tuple) {
- // Tuples are discarded
- }
-
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamBase.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamBase.java
Tue Jul 22 11:06:50 2014
@@ -20,12 +20,10 @@ package org.apache.jena.riot.lang;
import java.util.Collection;
-import org.apache.jena.atlas.lib.Tuple;
import org.apache.jena.riot.system.PrefixMap;
import org.apache.jena.riot.system.PrefixMapFactory;
import org.apache.jena.riot.system.StreamRDF;
-import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -53,9 +51,6 @@ public abstract class CollectorStreamBas
public void triple(Triple triple) {}
@Override
- public void tuple(Tuple<Node> tuple) {}
-
- @Override
public void quad(Quad quad) {}
@Override
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java?rev=1612543&view=auto
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java
(added)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java
Tue Jul 22 11:06:50 2014
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.lang;
+
+import java.util.ArrayList ;
+import java.util.List ;
+
+import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMapFactory ;
+import org.apache.jena.riot.system.StreamRDF ;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+
+/**
+ * StreamRDF implementations which store received triples and quads
+ * in a {@link java.util.Collection}.
+ *
+ * The resulting collection can be retrieved via the
+ * {@link #getTriples()} and {@link #getQuads()}
+ * methods.
+ *
+ * The implementations are suitable for single-threaded parsing, for use with
small
+ * data or distributed computing frameworks (e.g. Hadoop) where the overhead
+ * of creating many threads for a push-pull parser setup is significant.
+ */
+public class CollectorStreamRDF implements StreamRDF {
+ private PrefixMap prefixes = PrefixMapFactory.createForInput();
+ private String baseIri;
+
+ private List<Triple> triples = new ArrayList<>();
+ private List<Quad> quads = new ArrayList<>();
+
+ @Override
+ public void start() {
+ triples.clear() ;
+ quads.clear() ;
+ prefixes = PrefixMapFactory.createForInput();
+ }
+
+ @Override
+ public void finish() {}
+
+ @Override
+ public void triple(Triple triple) { triples.add(triple) ; }
+
+ @Override
+ public void quad(Quad quad) { quads.add(quad) ; }
+
+ @Override
+ public void base(String base) {
+ this.baseIri = base;
+ }
+
+ @Override
+ public void prefix(String prefix, String iri) {
+ prefixes.add(prefix, iri);
+ }
+
+ public PrefixMap getPrefixes() {
+ return prefixes;
+ }
+
+ public String getBaseIri() {
+ return baseIri;
+ }
+
+ public List<Triple> getTriples() { return triples ; }
+ public List<Quad> getQuads() { return quads ; }
+}
Propchange:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamRDF.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java
Tue Jul 22 11:06:50 2014
@@ -18,10 +18,8 @@
package org.apache.jena.riot.lang ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.system.StreamRDF ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -53,10 +51,4 @@ public class PipedQuadsStream extends Pi
{
receive(quad) ;
}
-
- @Override
- public void tuple(Tuple<Node> tuple)
- {
- // Tuples are discarded
- }
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java
Tue Jul 22 11:06:50 2014
@@ -18,10 +18,8 @@
package org.apache.jena.riot.lang ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.system.StreamRDF ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -53,10 +51,4 @@ public class PipedTriplesStream extends
{
// Quads are discarded
}
-
- @Override
- public void tuple(Tuple<Node> tuple)
- {
- // Tuples are discarded
- }
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java
Tue Jul 22 11:06:50 2014
@@ -53,10 +53,4 @@ public class PipedTuplesStream extends P
{
// Quads are discarded
}
-
- @Override
- public void tuple(Tuple<Node> tuple)
- {
- receive(tuple) ;
- }
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/StreamRDFCounting.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/StreamRDFCounting.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/StreamRDFCounting.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/StreamRDFCounting.java
Tue Jul 22 11:06:50 2014
@@ -27,5 +27,4 @@ public interface StreamRDFCounting exten
public long count() ;
public long countTriples() ;
public long countQuads() ;
- public long countTuples() ;
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
Tue Jul 22 11:06:50 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList ;
import java.util.List ;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.system.StreamRDF ;
import com.hp.hpl.jena.graph.Node ;
@@ -154,9 +153,6 @@ public class BatchedStreamRDF implements
}
@Override
- public void tuple(Tuple<Node> tuple) { throw new
UnsupportedOperationException("Tuples not supported") ; }
-
- @Override
public void base(String base) { batchProc.base(base) ; }
@Override
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
Tue Jul 22 11:06:50 2014
@@ -16,58 +16,47 @@
* limitations under the License.
*/
-package org.apache.jena.riot.system;
+package org.apache.jena.riot.system ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.out.NodeFmtLib ;
import org.slf4j.Logger ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
-public class LoggingStreamRDF implements StreamRDF
-{
+public class LoggingStreamRDF implements StreamRDF {
private Logger log ;
- public LoggingStreamRDF(Logger log) { this.log = log ; }
+ public LoggingStreamRDF(Logger log) {
+ this.log = log ;
+ }
@Override
- public void start()
- {}
+ public void start() {}
@Override
- public void triple(Triple triple)
- {
+ public void triple(Triple triple) {
String string = NodeFmtLib.str(triple) ;
log.info(string) ;
}
@Override
- public void quad(Quad quad)
- {
+ public void quad(Quad quad) {
String string = NodeFmtLib.str(quad) ;
log.info(string) ;
}
@Override
- public void tuple(Tuple<Node> tuple)
- {}
-
- @Override
- public void base(String base)
- {
- log.info("BASE -- "+base) ;
+ public void base(String base) {
+ log.info("BASE -- " + base) ;
}
@Override
- public void prefix(String prefix, String iri)
- {
- log.info("Prefix ("+prefix+","+iri+")") ;
+ public void prefix(String prefix, String iri) {
+ log.info("Prefix (" + prefix + "," + iri + ")") ;
}
@Override
- public void finish()
- {}
+ public void finish() {}
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF.java
Tue Jul 22 11:06:50 2014
@@ -18,9 +18,6 @@
package org.apache.jena.riot.system;
-import org.apache.jena.atlas.lib.Tuple ;
-
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -41,9 +38,9 @@ public interface StreamRDF
/** Quad emitted */
public void quad(Quad quad) ;
- /** Generalized emitted */
- public void tuple(Tuple<Node> tuple) ;
-
+// /** Generalized emitted */
+// public void tuple(Tuple<Node> tuple) ;
+//
/** base declaration seen */
public void base(String base) ;
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
Tue Jul 22 11:06:50 2014
@@ -18,9 +18,6 @@
package org.apache.jena.riot.system;
-import org.apache.jena.atlas.lib.Tuple ;
-
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -54,12 +51,6 @@ public class StreamRDF2 implements Strea
}
@Override
- public void tuple(Tuple<Node> tuple) {
- sink1.tuple(tuple) ;
- sink2.tuple(tuple) ;
- }
-
- @Override
public void base(String base) {
sink1.base(base) ;
sink2.base(base) ;
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFBase.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFBase.java
Tue Jul 22 11:06:50 2014
@@ -18,9 +18,6 @@
package org.apache.jena.riot.system;
-import org.apache.jena.atlas.lib.Tuple ;
-
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -39,10 +36,6 @@ public class StreamRDFBase implements St
{}
@Override
- public void tuple(Tuple<Node> tuple)
- {}
-
- @Override
public void base(String base)
{}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java
Tue Jul 22 11:06:50 2014
@@ -18,10 +18,8 @@
package org.apache.jena.riot.system ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.lang.StreamRDFCounting ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -29,7 +27,6 @@ import com.hp.hpl.jena.sparql.core.Quad
public class StreamRDFCountingBase extends StreamRDFWrapper implements
StreamRDF, StreamRDFCounting {
private long countTriples = 0 ;
private long countQuads = 0 ;
- private long countTuples = 0 ;
private long countBase = 0 ;
private long countPrefixes = 0 ;
@@ -50,14 +47,8 @@ public class StreamRDFCountingBase exten
}
@Override
- public void tuple(Tuple<Node> tuple) {
- countTuples++ ;
- super.tuple(tuple) ;
- }
-
- @Override
public long count() {
- return countTriples + countQuads + countTuples ;
+ return countTriples + countQuads ;
}
@Override
@@ -69,9 +60,4 @@ public class StreamRDFCountingBase exten
public long countQuads() {
return countQuads ;
}
-
- @Override
- public long countTuples() {
- return countTuples ;
- }
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWrapper.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWrapper.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWrapper.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWrapper.java
Tue Jul 22 11:06:50 2014
@@ -18,9 +18,6 @@
package org.apache.jena.riot.system;
-import org.apache.jena.atlas.lib.Tuple ;
-
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -51,10 +48,6 @@ public class StreamRDFWrapper implements
{ sink.quad(quad) ; }
@Override
- public void tuple(Tuple<Node> tuple)
- { sink.tuple(tuple) ; }
-
- @Override
public void base(String base)
{ sink.base(base) ; }
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java?rev=1612543&view=auto
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java
(added)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java
Tue Jul 22 11:06:50 2014
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import org.apache.jena.riot.system.StreamRDF ;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+
+/** An item in a stream of RDF data.
+ * This is the row item for pull-processing an RDF stream.
+ * @see StreamRDF for push processing.
+ */
+
+public interface StreamRowRDF {
+ public boolean isTriple() ;
+ public Triple getTriple() ;
+
+ public boolean isQuad() ;
+ public Quad getQuad() ;
+}
Propchange:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDF.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java?rev=1612543&view=auto
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java
(added)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java
Tue Jul 22 11:06:50 2014
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+
+public class StreamRowRDFBase implements StreamRowRDF {
+ private final Triple triple ;
+ private final Quad quad ;
+
+ public StreamRowRDFBase(Triple triple) {
+ this(triple, null) ;
+ }
+
+ public StreamRowRDFBase(Quad quad) {
+ this(null, quad) ;
+ }
+
+ private StreamRowRDFBase(Triple triple, Quad quad) {
+ this.triple = triple ;
+ this.quad = quad ;
+ }
+
+ @Override
+ public boolean isTriple() {
+ return triple != null ;
+ }
+
+ @Override
+ public Triple getTriple() {
+ return triple ;
+ }
+
+ @Override
+ public boolean isQuad() {
+ return quad != null ;
+ }
+
+ @Override
+ public Quad getQuad() {
+ return quad ;
+ }
+}
Propchange:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRowRDFBase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java
Tue Jul 22 11:06:50 2014
@@ -23,7 +23,6 @@ import java.io.OutputStream ;
import java.io.Writer ;
import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.out.NodeFormatterTTL ;
import org.apache.jena.riot.out.NodeToLabel ;
import org.apache.jena.riot.system.PrefixMap ;
@@ -120,10 +119,6 @@ public abstract class WriterStreamRDFBas
}
@Override
- public final void tuple(Tuple<Node> tuple)
- { throw new UnsupportedOperationException("Tuple<Node>") ; }
-
- @Override
public final void base(String base)
{
baseURI = base ;
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
Tue Jul 22 11:06:50 2014
@@ -16,11 +16,10 @@
* limitations under the License.
*/
-package org.apache.jena.riot.writer;
+package org.apache.jena.riot.writer ;
import org.apache.jena.atlas.io.AWriter ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.out.CharSpace ;
import org.apache.jena.riot.out.NodeFormatter ;
import org.apache.jena.riot.out.NodeFormatterNT ;
@@ -31,46 +30,44 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
-/** An output of triples / quads that is streaming.
- * It writes N-triples/N-quads.
+/**
+ * An output of triples / quads that is streaming. It writes N-triples/N-quads.
*/
-public class WriterStreamRDFTuples implements StreamRDF
-{
+public class WriterStreamRDFTuples implements StreamRDF {
// This class is the overall structure - the NodeFormatter controls the
// appearance of the Nodes themselves.
- protected final AWriter out ;
- protected final NodeFormatter nodeFmt ;
+ protected final AWriter out ;
+ protected final NodeFormatter nodeFmt ;
- /** Output tuples, using UTF8 output
- * See {@linkplain StreamRDFLib#writer} for ways to create a AWriter
object.
+ /**
+ * Output tuples, using UTF8 output See {@linkplain StreamRDFLib#writer}
for
+ * ways to create a AWriter object.
*/
- public WriterStreamRDFTuples(AWriter w)
- {
+ public WriterStreamRDFTuples(AWriter w) {
this(w, CharSpace.UTF8) ;
}
-
- /** Output tuples, choosing ASCII or UTF8
- * See {@linkplain StreamRDFLib#writer} for ways to create a AWriter
object.
+
+ /**
+ * Output tuples, choosing ASCII or UTF8 See
+ * {@linkplain StreamRDFLib#writer} for ways to create a AWriter object.
*/
- public WriterStreamRDFTuples(AWriter w, CharSpace charSpace)
- {
+ public WriterStreamRDFTuples(AWriter w, CharSpace charSpace) {
out = w ;
nodeFmt = new NodeFormatterNT(charSpace) ;
}
@Override
- public void start()
- {}
+ public void start() {}
@Override
- public void finish()
- { IO.flush(out) ; }
+ public void finish() {
+ IO.flush(out) ;
+ }
@Override
- public void triple(Triple triple)
- {
+ public void triple(Triple triple) {
Node s = triple.getSubject() ;
Node p = triple.getPredicate() ;
Node o = triple.getObject() ;
@@ -84,8 +81,7 @@ public class WriterStreamRDFTuples imple
}
@Override
- public void quad(Quad quad)
- {
+ public void quad(Quad quad) {
Node s = quad.getSubject() ;
Node p = quad.getPredicate() ;
Node o = quad.getObject() ;
@@ -97,43 +93,24 @@ public class WriterStreamRDFTuples imple
out.print(" ") ;
format(o) ;
- if ( outputGraphSlot(g) )
- {
+ if ( outputGraphSlot(g) ) {
out.print(" ") ;
format(g) ;
}
out.print(" .\n") ;
}
- @Override
- public void tuple(Tuple<Node> tuple)
- {
- boolean first = true ;
- for ( Node n : tuple )
- {
- if ( ! first )
- out.print(" ") ;
- first = false ;
- format(n) ;
- }
- out.print(" .\n") ;
- }
-
- private void format(Node n)
- {
+ private void format(Node n) {
nodeFmt.format(out, n) ;
}
@Override
- public void base(String base)
- {}
+ public void base(String base) {}
@Override
- public void prefix(String prefix, String iri)
- {}
+ public void prefix(String prefix, String iri) {}
- private static boolean outputGraphSlot(Node g)
- {
- return ( g != null && g != Quad.tripleInQuad && !
Quad.isDefaultGraph(g) ) ;
+ private static boolean outputGraphSlot(Node g) {
+ return (g != null && g != Quad.tripleInQuad &&
!Quad.isDefaultGraph(g)) ;
}
}
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
Tue Jul 22 11:06:50 2014
@@ -3,12 +3,10 @@ package org.apache.jena.riot.lang;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jena.atlas.lib.Tuple;
import org.apache.jena.riot.system.StreamRDF;
import org.junit.Assert;
import org.junit.Test;
-import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -58,26 +56,4 @@ public class TestCollectorStream {
Assert.assertEquals(expected, out.getCollected());
}
-
- private List<Tuple<Node>> writeTuples(StreamRDF out, int size) {
- List<Tuple<Node>> results = new ArrayList<>();
- out.start();
- for (int i = 1; i <= size; i++) {
- Tuple<Node> t =
Tuple.createTuple(NodeFactory.createURI("http://graph";),
- NodeFactory.createAnon(),
- NodeFactory.createURI("http://predicate";),
NodeFactoryExtra.intToNode(i));
- out.tuple(t);
- results.add(t);
- }
- out.finish();
- return results;
- }
-
- @Test
- public void test_streamed_tuples() {
- CollectorStreamTuples out = new CollectorStreamTuples();
- List<Tuple<Node>> expected = writeTuples(out, 10);
-
- Assert.assertEquals(expected, out.getCollected());
- }
}
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
Tue Jul 22 11:06:50 2014
@@ -23,15 +23,12 @@ import java.util.List ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.Pair ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.Test ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -43,7 +40,6 @@ public class TestParserFactory extends B
{
List<Triple> triples = new ArrayList<>() ;
List<Quad> quads = new ArrayList<>() ;
- List<Tuple<Node>> tuples = new ArrayList<>() ;
List<Pair<String,String>> prefixes = new ArrayList<>() ;
List<String> bases = new ArrayList<>() ;
@@ -57,8 +53,6 @@ public class TestParserFactory extends B
@Override public void quad(Quad quad) { quads.add(quad) ; }
- @Override public void tuple(Tuple<Node> tuple) { tuples.add(tuple) ; }
-
@Override public void base(String base) { bases.add(base) ; }
@Override public void prefix(String prefix, String iri) {
prefixes.add(Pair.create(prefix, iri)) ; }
@@ -78,7 +72,6 @@ public class TestParserFactory extends B
assertEquals(1, sink.finishCalled) ;
assertEquals(1, sink.triples.size()) ;
assertEquals(0, sink.quads.size()) ;
- assertEquals(0, sink.tuples.size()) ;
assertEquals(SSE.parseTriple("(<x> <p> <q>)"), last(sink.triples)) ;
}
@@ -93,7 +86,6 @@ public class TestParserFactory extends B
assertEquals(1, sink.finishCalled) ;
assertEquals(1, sink.triples.size()) ;
assertEquals(0, sink.quads.size()) ;
- assertEquals(0, sink.tuples.size()) ;
assertEquals(SSE.parseTriple("(<http://base/x> <http://base/p>
<http://base/q>)"), last(sink.triples)) ;
}
@@ -108,8 +100,6 @@ public class TestParserFactory extends B
assertEquals(1, sink.finishCalled) ;
assertEquals(0, sink.triples.size()) ;
assertEquals(1, sink.quads.size()) ;
- assertEquals(0, sink.tuples.size()) ;
-
Quad q = SSE.parseQuad("(<g> <x> <p> <q>)") ;
assertEquals(q, last(sink.quads)) ;
}
@@ -125,7 +115,6 @@ public class TestParserFactory extends B
assertEquals(1, sink.finishCalled) ;
assertEquals(0, sink.triples.size()) ;
assertEquals(1, sink.quads.size()) ;
- assertEquals(0, sink.tuples.size()) ;
Triple t = SSE.parseTriple("(<http://base/x> <http://base/p>
<http://base/q>)") ;
Quad q = new Quad(Quad.tripleInQuad, t) ;
@@ -143,7 +132,6 @@ public class TestParserFactory extends B
assertEquals(1, sink.finishCalled) ;
assertEquals(0, sink.triples.size()) ;
assertEquals(1, sink.quads.size()) ;
- assertEquals(0, sink.tuples.size()) ;
Quad q = SSE.parseQuad("(<http://base/g> <http://base/x>
<http://base/p> <http://base/q>)") ;
assertEquals(q, last(sink.quads)) ;
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
Tue Jul 22 11:06:50 2014
@@ -18,32 +18,23 @@
package org.apache.jena.riot.lang;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.Charset;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Assert;
-
-import org.apache.jena.atlas.lib.Tuple;
-import org.apache.jena.riot.RDFDataMgr;
-import org.apache.jena.riot.RDFLanguages;
-import org.apache.jena.riot.RiotException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
+import java.io.ByteArrayInputStream ;
+import java.nio.charset.Charset ;
+import java.util.concurrent.* ;
+
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.junit.AfterClass ;
+import org.junit.Assert ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/**
* Tests for the {@link PipedRDFIterator} implementation
@@ -364,151 +355,6 @@ public class TestPipedRDFIterators {
this.test_streamed_quads(10000, 100000, false);
}
- private void test_streamed_tuples(int bufferSize, final int generateSize,
boolean fair) throws InterruptedException,
- ExecutionException, TimeoutException {
-
- final PipedRDFIterator<Tuple<Node>> it = new PipedRDFIterator<>();
- final PipedTuplesStream out = new PipedTuplesStream(it);
-
- // Create a runnable that will generate tuples
- Runnable genQuads = new Runnable() {
-
- @Override
- public void run() {
- out.start();
- // Generate tuples
- for (int i = 1; i <= generateSize; i++) {
- Tuple<Node> t =
Tuple.createTuple(com.hp.hpl.jena.graph.NodeFactory.createURI("http://graph";),
- com.hp.hpl.jena.graph.NodeFactory.createAnon(),
-
com.hp.hpl.jena.graph.NodeFactory.createURI("http://predicate";),
NodeFactoryExtra.intToNode(i));
- out.tuple(t);
- }
- out.finish();
- return;
- }
- };
-
- // Create a runnable that will consume tuples
- Callable<Integer> consumeQuads = new Callable<Integer>() {
-
- @Override
- public Integer call() throws Exception {
- int count = 0;
- while (it.hasNext()) {
- it.next();
- count++;
- }
- return count;
- }
- };
-
- // Run the threads
- Future<?> genResult = executor.submit(genQuads);
- Future<Integer> result = executor.submit(consumeQuads);
- Integer count = 0;
- try {
- count = result.get(5, TimeUnit.SECONDS);
- } catch (TimeoutException e) {
- // Check that it wasn't the producer thread erroring that caused us
- // to time out
- genResult.get();
- // It wasn't so throw the original error
- throw e;
- }
- Assert.assertEquals(generateSize, (int) count);
- }
-
- /**
- * Test that blocking and waiting work nicely
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_01() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is tiny
- this.test_streamed_tuples(1, 100, true);
- }
-
- /**
- * Test that blocking and waiting work nicely
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_02() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is much smaller than generated tuples
- this.test_streamed_tuples(10, 1000, false);
- }
-
- /**
- * Test that blocking and waiting work nicely
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_03() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is smaller than generated tuples
- this.test_streamed_tuples(100, 1000, false);
- }
-
- /**
- * Test where blocking should rarely occur
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_04() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is same as generated tuples
- this.test_streamed_tuples(1000, 1000, false);
- }
-
- /**
- * Test where blocking should rarely occur
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_05() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is much larger than generated tuples
- this.test_streamed_tuples(10000, 1000, false);
- }
-
- /**
- * Test where blocking may occur
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_06() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is small relative to generated tuples
- this.test_streamed_tuples(1000, 100000, false);
- }
-
- /**
- * Test where blocking may occur
- *
- * @throws ExecutionException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @Test
- public void streamed_tuples_iterator_07() throws InterruptedException,
ExecutionException, TimeoutException {
- // Buffer size is small relative to generated tuples
- this.test_streamed_tuples(10000, 100000, false);
- }
-
/**
* Test for bad buffer size
*/
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestStreamRDF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestStreamRDF.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestStreamRDF.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestStreamRDF.java
Tue Jul 22 11:06:50 2014
@@ -44,7 +44,6 @@ public class TestStreamRDF extends BaseT
assertEquals(2, stream.count()) ;
assertEquals(2, stream.countTriples()) ;
assertEquals(0, stream.countQuads()) ;
- assertEquals(0, stream.countTuples()) ;
}
@Test public void stream_count_02() {
@@ -56,7 +55,6 @@ public class TestStreamRDF extends BaseT
assertEquals(2, stream.count()) ;
assertEquals(1, stream.countTriples()) ;
assertEquals(1, stream.countQuads()) ;
- assertEquals(0, stream.countTuples()) ;
stream.finish();
}
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkRDFLimited.java
Tue Jul 22 11:06:50 2014
@@ -18,11 +18,9 @@
package org.apache.jena.fuseki.migrate;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFWrapper ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -51,14 +49,6 @@ public class SinkRDFLimited extends Stre
super.quad(quad) ;
}
- @Override
- public void tuple(Tuple<Node> tuple)
- {
- count++ ;
- super.tuple(tuple) ;
- }
-
-
public long getCount() { return count ; }
public long getLimit() { return limit ; }
}
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java?rev=1612543&r1=1612542&r2=1612543&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
Tue Jul 22 11:06:50 2014
@@ -22,7 +22,6 @@ import java.io.InputStream ;
import java.util.List ;
import org.apache.jena.atlas.event.EventType ;
-import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
@@ -266,11 +265,6 @@ public class BulkLoader {
public void start() {}
@Override
- public void tuple(Tuple<Node> tuple) {
- throw new TDBException("Tuple encountered while loading a
dataset") ;
- }
-
- @Override
public void base(String base) {}
@Override
@@ -352,11 +346,6 @@ public class BulkLoader {
}
@Override
- public void tuple(Tuple<Node> tuple) {
- throw new TDBException("Tuple encountered while loading a single
graph") ;
- }
-
- @Override
public void base(String base) {}
@Override
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=1612543&r1=1612542&r2=1612543&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
Tue Jul 22 11:06:50 2014
@@ -30,7 +30,6 @@ import org.apache.jena.atlas.AtlasExcept
import org.apache.jena.atlas.io.IO ;
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.LogCtl ;
import org.apache.jena.atlas.logging.ProgressLogger ;
import org.apache.jena.riot.Lang ;
@@ -47,7 +46,6 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.tdb.TDB ;
-import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
@@ -276,10 +274,6 @@ public class CmdNodeTableBuilder extends
public StatsCollectorNodeId getCollector() { return stats ; }
@Override
- public void tuple(Tuple<Node> tuple)
- { throw new TDBException("Unexpected: tuple in bulk load (expected
quads or triples)") ; }
-
- @Override
public void base(String base)
{}
