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 2014/11/11 11:21:39 UTC
[1/3] jena git commit: JENA-813 : Use IteratorConcat for iteraing
over all graphs.
Repository: jena
Updated Branches:
refs/heads/master 2746da8ee -> 44fdb1eb6
JENA-813 : Use IteratorConcat for iteraing over all graphs.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e4554796
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e4554796
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e4554796
Branch: refs/heads/master
Commit: e4554796a25b919595c17632259a8de02664276d
Parents: 4554915
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 10:19:49 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 10:19:49 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e4554796/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
index 8de21f3..ac9530d 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.core;
import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorConcat ;
import org.apache.jena.atlas.lib.Lib ;
import com.hp.hpl.jena.graph.Graph ;
@@ -70,15 +71,15 @@ public abstract class DatasetGraphCollection extends DatasetGraphBaseFind
protected Iterator<Quad> findInAnyNamedGraphs(Node s, Node p, Node o)
{
Iterator<Node> gnames = listGraphNodes() ;
- Iterator<Quad> iter = null ;
+ IteratorConcat<Quad> iter = new IteratorConcat<>() ;
+
// Named graphs
for ( ; gnames.hasNext() ; )
{
Node gn = gnames.next();
Iterator<Quad> qIter = findInSpecificNamedGraph(gn, s, p, o) ;
if ( qIter != null )
- // copes with null for iter
- iter = Iter.append(iter, qIter) ;
+ iter.add(qIter) ;
}
return iter ;
}
[2/3] jena git commit: JENA-813 : Add comments on usage.
Posted by an...@apache.org.
JENA-813 : Add comments on usage.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/62ebeeea
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/62ebeeea
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/62ebeeea
Branch: refs/heads/master
Commit: 62ebeeeaf7c2e8b69203c8cab12c69579b65d632
Parents: e455479
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 10:20:11 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 10:20:11 2014 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/atlas/iterator/Iter.java | 5 +++++
.../java/org/apache/jena/atlas/iterator/IteratorConcat.java | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/62ebeeea/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index 52352ea..d8f97fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -443,11 +443,16 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
return Iter.operate(stream, action) ;
}
+ /** See {@linkplain #append(Iterator, Iterator)} for scale considerations */
public static <T> Iterator<T> append(Iterable<T> iter1, Iterable<T> iter2) {
return IteratorCons.create(iterator(iter1), iterator(iter2)) ;
}
// Could try for <? extends T> on each arg.
+ /** Join two iterators.
+ * If there potentially going to be many iterators, it is better to
+ * create an {@linkplain IteratorConcat} explicitly and add each iterator
+ */
public static <T> Iterator<T> append(Iterator<? extends T> iter1, Iterator<? extends T> iter2) {
return IteratorCons.create(iter1, iter2) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/62ebeeea/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
index 34badf9..bc8bdfd 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
@@ -37,7 +37,13 @@ public class IteratorConcat<T> implements Iterator<T>
private Iterator<T> removeFrom = null ;
boolean finished = false ;
- /** @see IteratorCons */
+ /**
+ * Usually better to create an IteratorConcat explicitly and add iterator if theer are going to be many.
+ * @param iter1
+ * @param iter2
+ * @return Iterator
+ * @see IteratorCons
+ */
public static <T> Iterator<T> concat(Iterator<T> iter1, Iterator<T> iter2)
{
if (iter2 == null) return iter1 ;
[3/3] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/44fdb1eb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/44fdb1eb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/44fdb1eb
Branch: refs/heads/master
Commit: 44fdb1eb62b25818d981a3f7a98064e1c2fe604f
Parents: 62ebeee 2746da8
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 10:20:51 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 10:20:51 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/ResultSetMgr.java | 16 +++++++--
.../jena/riot/resultset/ResultSetWriter.java | 5 +++
.../riot/resultset/ResultSetWriterRegistry.java | 36 ++++++++++++++++----
3 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------