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 2021/08/11 10:34:23 UTC
[jena] branch main updated: JENA-2147: Add DatasetGraph.stream
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new b0abff5 JENA-2147: Add DatasetGraph.stream
new ba2817a Merge pull request #1046 from afs/jena2147-dsg-stream
b0abff5 is described below
commit b0abff5c105522f16f38ca07b202708aede8b26b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Aug 10 13:20:08 2021 +0100
JENA-2147: Add DatasetGraph.stream
---
.../org/apache/jena/sparql/core/DatasetGraph.java | 26 ++++-
.../jena/sparql/core/AbstractDatasetGraphFind.java | 106 ++++++++++++---------
2 files changed, 84 insertions(+), 48 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
index 5b2cb33..3afce26 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
@@ -19,7 +19,9 @@
package org.apache.jena.sparql.core ;
import java.util.Iterator ;
+import java.util.stream.Stream;
+import org.apache.jena.atlas.iterator.Iter;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
@@ -99,8 +101,8 @@ public interface DatasetGraph extends Transactional, Closeable
/** Add a quad */
public void add(Node g, Node s, Node p, Node o) ;
-
- /** Add the {@code src} DatasetGraph to this one. */
+
+ /** Add the {@code src} DatasetGraph to this one. */
public default void addAll(DatasetGraph src) {
src.find().forEachRemaining(this::add);
}
@@ -112,7 +114,9 @@ public interface DatasetGraph extends Transactional, Closeable
public void deleteAny(Node g, Node s, Node p, Node o) ;
/** Iterate over all quads in the dataset graph */
- public Iterator<Quad> find() ;
+ public default Iterator<Quad> find() {
+ return find(Node.ANY, Node.ANY, Node.ANY, Node.ANY);
+ }
/** Find matching quads in the dataset - may include wildcards, Node.ANY or null
* @see Graph#find(Triple)
@@ -129,6 +133,22 @@ public interface DatasetGraph extends Transactional, Closeable
*/
public Iterator<Quad> findNG(Node g, Node s, Node p , Node o) ;
+ /** Returns a {@link Stream} of {@link Quad Quads} matching a pattern.
+ *
+ * @return a stream of quads in this dataset matching the pattern.
+ */
+ public default Stream<Quad> stream(Node g, Node s, Node p, Node o) {
+ return Iter.asStream(find(g, s, p, o));
+ }
+
+ /** Returns a {@link Stream} of {@link Quad Quads} in this dataset.
+ *
+ * @return a stream of quads in this dataset.
+ */
+ public default Stream<Quad> stream() {
+ return stream(Node.ANY, Node.ANY, Node.ANY, Node.ANY);
+ }
+
/** Test whether the dataset (including default graph) contains a quad - may include wildcards, Node.ANY or null */
public boolean contains(Node g, Node s, Node p , Node o) ;
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphFind.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphFind.java
index 86c031f..c99942e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphFind.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphFind.java
@@ -22,6 +22,7 @@ import static org.apache.jena.atlas.iterator.Iter.asStream ;
import static org.apache.jena.atlas.iterator.Iter.toList;
import static org.apache.jena.atlas.iterator.Iter.toSet;
import static org.apache.jena.atlas.junit.AssertExtra.assertEqualsUnordered;
+import static org.apache.jena.atlas.lib.StreamOps.toList;
import static org.junit.Assert.assertEquals ;
import static org.junit.Assert.assertFalse ;
import static org.junit.Assert.assertNotNull;
@@ -52,32 +53,32 @@ import org.junit.Test ;
* @see AbstractTestGraphOverDatasetGraph
*/
public abstract class AbstractDatasetGraphFind {
-
+
// More ordering tests.
// More tests for AbstractDatasetGraphTests
-
+
// == Union graph in tests.
// AbstractTestDynamicDataset
// AbstractTestGraphOverDataset
// AbstractTestUnionTransform -> TestUnionTransformQuads, TestUnionTransformTriples
// TestDatasetGraphViewGraphs
-
+
// GraphsTests -> TestGraphsMem (reenable)
// GraphsTests => AbstractTestGraphsTDB
-
+
// TestGraphUnionRead : GraphUnionRead
// TestUnionGraph
static Node s = SSE.parseNode(":s") ;
static Node p = SSE.parseNode(":p") ;
static Node o = SSE.parseNode(":o") ;
static Node g1 = SSE.parseNode(":g1") ;
-
+
static Quad q1 = Quad.create(Quad.defaultGraphIRI, s, p, o ) ;
static Quad q2 = Quad.create(Quad.defaultGraphIRI, s, p, NodeConst.nodeZero ) ;
-
+
static Quad q3 = SSE.parseQuad("(:g1 :s :p :o)") ;
static Quad q4 = SSE.parseQuad("(:g1 :s :p 1)") ;
-
+
static Quad q5 = SSE.parseQuad("(:g2 :s :p :o)") ;
static Quad q6 = SSE.parseQuad("(:g2 :s :p 1)") ;
static Quad q7 = SSE.parseQuad("(:g2 :s :p 2)") ;
@@ -85,45 +86,45 @@ public abstract class AbstractDatasetGraphFind {
static Quad q8 = SSE.parseQuad("(:g3 :s :p :o)") ;
static Quad q9 = SSE.parseQuad("(:g3 :s :p 1)") ;
static Quad q10 = SSE.parseQuad("(:g3 :s :p 2)") ;
-
+
static List<Quad> data = Arrays.asList(q1, q2, q3, q4, q5, q6, q7, q8, q9, q10) ;
-
+
// Helper.
static void add(DatasetGraph data, Collection<Quad> quads) {
- for ( Quad q : quads ) data.add(q);
+ for ( Quad q : quads ) data.add(q);
}
/**
* Create the dataset to test loaded with the supplied data - this dataset need not be mutable.
- * Either supply {@link #create()} or override this method.
+ * Either supply {@link #create()} or override this method.
*/
protected DatasetGraph create(Collection<Quad> data) {
DatasetGraph dsg = create() ;
add(dsg, data) ;
return dsg ;
}
-
+
/** Easy route - create empty, mutable dataset.
* If providing {@link #create(Collection)}, return null for this.
*/
protected abstract DatasetGraph create() ;
-
+
// Specifically having the DatasetGraphBaseFind.findInUnionGraph
// This may be pulled into DatasetGraph sometime.
protected DatasetGraphBaseFind createFind(DatasetGraph dsg) {
- try {
+ try {
return (DatasetGraphBaseFind)dsg ;
} catch (ClassCastException ex) {
fail("Not a DatasetGraphBaseFind: "+dsg.getClass().getSimpleName()) ;
return null ;
}
}
-
+
private DatasetGraph dsg ;
@Before public void setup() {
dsg = create(data) ;
}
-
+
// Coverage of calls to DatasetGraphBaseFind:
// All: dft graph and named graphs
// findNG(Wildcard for g) -> findInAnyNamedGraphs
@@ -131,15 +132,15 @@ public abstract class AbstractDatasetGraphFind {
// Default graph via quad -> findInDftGraph
// Union graph for g -> findInUnionGraph
// Not al these tests are specific to DatasetGraphBaseFind
-
- @Test public void find_quad_01() {
+
+ @Test public void find_quad_01() {
List<Quad> x = toList(dsg.find()) ;
assertEquals(10, x.size()) ;
assertTrue(x.contains(q1)) ;
assertTrue(x.contains(q5)) ;
}
-
- @Test public void find_quad_02() {
+
+ @Test public void find_quad_02() {
List<Quad> x = toList(dsg.find(null, s,p,o)) ;
assertEquals(4, x.size()) ;
assertFalse(x.contains(q2)) ;
@@ -147,15 +148,15 @@ public abstract class AbstractDatasetGraphFind {
assertTrue(x.contains(q5)) ;
}
- @Test public void find_ng_01() {
+ @Test public void find_ng_01() {
List<Quad> x = toList(dsg.findNG(null, null, null, null)) ;
assertEquals(8, x.size()) ;
assertTrue(x.contains(q4)) ;
assertTrue(x.contains(q10)) ;
assertFalse(x.contains(q1)) ;
}
-
- @Test public void find_ng_02() {
+
+ @Test public void find_ng_02() {
List<Quad> x = toList(dsg.findNG(null, s, p, o)) ;
assertEquals(3, x.size()) ;
assertFalse(x.contains(q4)) ;
@@ -164,45 +165,45 @@ public abstract class AbstractDatasetGraphFind {
assertTrue(x.contains(q5)) ;
assertTrue(x.contains(q8)) ;
}
-
- @Test public void find_specific_01() {
+
+ @Test public void find_specific_01() {
List<Quad> x = toList(dsg.find(g1, null, null, null)) ;
assertEquals(2, x.size()) ;
assertTrue(x.contains(q4)) ;
assertTrue(x.contains(q3)) ;
}
-
- @Test public void find_specific_02() {
+
+ @Test public void find_specific_02() {
List<Quad> x = toList(dsg.find(g1, null, null, NodeConst.nodeOne)) ;
assertEquals(1, x.size()) ;
assertTrue(x.contains(q4)) ;
}
-
- @Test public void find_dft_01() {
+
+ @Test public void find_dft_01() {
List<Quad> x = toList(dsg.find(Quad.defaultGraphIRI, null, null, null)) ;
assertEquals(2, x.size()) ;
assertTrue(x.contains(q1)) ;
assertTrue(x.contains(q2)) ;
}
-
- @Test public void find_dft_02() {
+
+ @Test public void find_dft_02() {
List<Quad> x = toList(dsg.find(Quad.defaultGraphIRI, null, null, NodeConst.nodeOne)) ;
assertEquals(0, x.size()) ;
}
-
- @Test public void find_dft_03() {
+
+ @Test public void find_dft_03() {
List<Quad> x = toList(dsg.find(Quad.defaultGraphIRI, null, null, NodeConst.nodeZero)) ;
assertEquals(1, x.size()) ;
assertTrue(x.contains(q2)) ;
}
-
+
// Union graph by name.
@Test public void find_union_01() {
List<Quad> x = toList(dsg.find(Quad.unionGraph, null, null, null)) ;
assertEquals(3, x.size()) ;
x.stream().allMatch(q->q.getGraph().equals(Quad.unionGraph)) ;
-
+
List<Triple> z = x.stream().map(Quad::asTriple).collect(Collectors.toList()) ;
assertTrue(z.contains(q4.asTriple())) ;
assertTrue(z.contains(q5.asTriple())) ;
@@ -213,7 +214,7 @@ public abstract class AbstractDatasetGraphFind {
}
// Union graph as graph
-
+
@Test public void find_union_02() {
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
assertNotNull(dsgx.getUnionGraph());
@@ -223,7 +224,7 @@ public abstract class AbstractDatasetGraphFind {
assertTrue(x.contains(q5.asTriple())) ;
assertTrue(x.contains(q10.asTriple())) ;
}
-
+
@Test public void find_union_03() {
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
assertNotNull(dsgx.getUnionGraph());
@@ -237,15 +238,15 @@ public abstract class AbstractDatasetGraphFind {
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
dsgx.getUnionGraph().add(q4.asTriple());
}
-
+
@Test(expected=DeleteDeniedException.class)
public void find_union_05() {
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
dsgx.getUnionGraph().delete(q4.asTriple());
}
-
+
// DatasetGraphBaseFind specific.
-
+
@Test public void find_dsgFind_union_02() {
Assume.assumeTrue("Not a DatasetGraphBaseFind", dsg instanceof DatasetGraphBaseFind) ;
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
@@ -255,7 +256,7 @@ public abstract class AbstractDatasetGraphFind {
assertTrue(x.contains(q5.asTriple())) ;
assertTrue(x.contains(q10.asTriple())) ;
}
-
+
@Test public void find_dsgFind_union_03() {
Assume.assumeTrue("Not a DatasetGraphBaseFind", dsg instanceof DatasetGraphBaseFind) ;
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
@@ -264,7 +265,7 @@ public abstract class AbstractDatasetGraphFind {
assertEqualsUnordered(x1, x2) ;
assertEquals(3, x2.size()) ;
}
-
+
@Test public void find_dsgFind_union_04() {
Assume.assumeTrue("Not a DatasetGraphBaseFind", dsg instanceof DatasetGraphBaseFind) ;
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
@@ -273,7 +274,7 @@ public abstract class AbstractDatasetGraphFind {
assertEquals(1, x.size()) ;
assertTrue(x.contains(q3.asTriple())) ;
}
-
+
@Test public void find_dsgFind_union_05() {
Assume.assumeTrue("Not a DatasetGraphBaseFind", dsg instanceof DatasetGraphBaseFind) ;
DatasetGraphBaseFind dsgx = (DatasetGraphBaseFind)dsg ;
@@ -282,11 +283,26 @@ public abstract class AbstractDatasetGraphFind {
assertEqualsUnordered(x1, x2) ;
assertEquals(1, x2.size()) ;
}
-
+
+ @Test public void stream_dsg_01() {
+ List<Quad> x = toList(dsg.stream());
+ assertEquals(10, x.size()) ;
+ assertTrue(x.contains(q1)) ;
+ assertTrue(x.contains(q5)) ;
+ }
+
+ @Test public void stream_dsg_02() {
+ List<Quad> x = toList(dsg.stream(null, s,p,o)) ;
+ assertEquals(4, x.size()) ;
+ assertFalse(x.contains(q2)) ;
+ assertFalse(x.contains(q4)) ;
+ assertTrue(x.contains(q5)) ;
+ }
+
static List<Triple> quadsToDistinctTriples(Iterator<Quad> iter) {
return asStream(iter).map(Quad::asTriple).distinct().collect(Collectors.toList()) ;
}
-
+
static void print(List<Quad> x) {
x.stream().sequential().forEach(System.out::println);
}