You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/11/04 00:50:27 UTC
[1/3] incubator-commonsrdf git commit: Jena DataSet Test
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/master 3ca2930e5 -> 99279a135
Jena DataSet Test
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/acc502dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/acc502dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/acc502dd
Branch: refs/heads/master
Commit: acc502dd19169accb440c20f473104fb2d72f324
Parents: 3ca2930
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 00:04:20 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 00:04:20 2016 +0000
----------------------------------------------------------------------
.../commons/rdf/jena/DatasetJenaTest.java | 31 ++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/acc502dd/jena/src/test/java/org/apache/commons/rdf/jena/DatasetJenaTest.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/DatasetJenaTest.java b/jena/src/test/java/org/apache/commons/rdf/jena/DatasetJenaTest.java
new file mode 100644
index 0000000..b07c36f
--- /dev/null
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/DatasetJenaTest.java
@@ -0,0 +1,31 @@
+/**
+ * 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.commons.rdf.jena;
+
+import org.apache.commons.rdf.api.AbstractDatasetTest;
+import org.apache.commons.rdf.api.RDF;
+
+public class DatasetJenaTest extends AbstractDatasetTest {
+
+ @Override
+ public RDF createFactory() {
+ return new JenaRDF();
+ }
+
+}
[3/3] incubator-commonsrdf git commit: Jena Dataset delete by wildcard
Posted by st...@apache.org.
Jena Dataset delete by wildcard
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/99279a13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/99279a13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/99279a13
Branch: refs/heads/master
Commit: 99279a1354087a8e5e49fc60cb74cc82376dd6d6
Parents: a048486
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 00:49:55 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 00:49:55 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/99279a13/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index f96fc62..e7602ca 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -110,8 +110,8 @@ class JenaDatasetImpl implements JenaDataset {
@Override
public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- graph.delete(org.apache.jena.sparql.core.Quad.create(toJenaPattern(graphName), toJenaPattern(subject),
- toJenaPattern(predicate), toJenaPattern(object)));
+ graph.deleteAny(toJenaPattern(graphName), toJenaPattern(subject),
+ toJenaPattern(predicate), toJenaPattern(object));
}
@Override
[2/3] incubator-commonsrdf git commit: JenaDatasetImpl correct quad
count
Posted by st...@apache.org.
JenaDatasetImpl correct quad count
.. as previous DatasetGraph.size() simply returned number of graphs
rather than quads, now we count triples in each named graph and add the
count of triples in the default graph.
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a0484867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a0484867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a0484867
Branch: refs/heads/master
Commit: a04848671707551523208516db145c3c946b6e05
Parents: acc502d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 00:04:34 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 00:44:37 2016 +0000
----------------------------------------------------------------------
.../org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a0484867/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
index 2cb0876..f96fc62 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/JenaDatasetImpl.java
@@ -23,6 +23,7 @@ import static org.apache.jena.graph.Node.ANY;
import java.io.StringWriter;
import java.util.Optional;
import java.util.UUID;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
@@ -120,7 +121,10 @@ class JenaDatasetImpl implements JenaDataset {
@Override
public long size() {
- return graph.size();
+ long quads = Iter.asStream(graph.listGraphNodes())
+ .map(graph::getGraph)
+ .collect(Collectors.summingLong(org.apache.jena.graph.Graph::size));
+ return quads + graph.getDefaultGraph().size();
}
@Override
@@ -145,8 +149,8 @@ class JenaDatasetImpl implements JenaDataset {
@Override
public Graph getGraph() {
- GraphView gv = GraphView.createDefaultGraph(graph);
- return new JenaGraphImpl(gv, salt);
+ GraphView g = GraphView.createDefaultGraph(graph);
+ return new JenaGraphImpl(g, salt);
}
@Override