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 2018/08/01 21:06:58 UTC
[1/2] jena git commit: Add missing oeprations to get-multiple
Repository: jena
Updated Branches:
refs/heads/master 8be7fd625 -> 6dac178f8
Add missing oeprations to get-multiple
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a8a3ce4a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a8a3ce4a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a8a3ce4a
Branch: refs/heads/master
Commit: a8a3ce4a71707f46ee2402446a38a7157dd1703f
Parents: 8be7fd6
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Aug 1 22:06:06 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Aug 1 22:06:06 2018 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/util/QueryExecUtils.java | 15 +++++++++++++
.../jena/sparql/util/graph/GraphUtils.java | 23 ++++++++++++++++----
2 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a8a3ce4a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
index 541bac0..5c12c2e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
@@ -18,6 +18,7 @@
package org.apache.jena.sparql.util ;
+import java.util.ArrayList;
import java.util.List ;
import org.apache.jena.atlas.json.JSON;
@@ -406,4 +407,18 @@ public class QueryExecUtils {
}
return r ;
}
+
+ /**
+ * Execute, returning all matches, which may be zero.
+ */
+ public static List<RDFNode> getAll(QueryExecution qExec, String varname) {
+ ResultSet rs = qExec.execSelect() ;
+ List<RDFNode> matches = new ArrayList<>();
+ rs.forEachRemaining(qs->{
+ RDFNode r = qs.get(varname) ;
+ if ( r != null )
+ matches.add(r);
+ });
+ return matches ;
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/a8a3ce4a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
index ce0243e..907a434 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.util.graph ;
import java.util.*;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.ListUtils;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
@@ -190,10 +191,9 @@ public class GraphUtils {
public static Resource findRootByType(Model model, Resource atype) {
String s = String.join("\n",
- "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
- "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
- "SELECT DISTINCT ?root { { ?root rdf:type ?ATYPE } UNION { ?root rdf:type ?t . ?t rdfs:subClassOf ?ATYPE } }") ;
-
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
+ "SELECT DISTINCT ?root { { ?root rdf:type ?ATYPE } UNION { ?root rdf:type ?t . ?t rdfs:subClassOf ?ATYPE } }") ;
Query q = QueryFactory.create(s) ;
QuerySolutionMap qsm = new QuerySolutionMap() ;
qsm.add("ATYPE", atype) ;
@@ -203,6 +203,21 @@ public class GraphUtils {
}
}
+ public static List<Resource> findRootsByType(Model model, Resource atype) {
+ String s = String.join("\n",
+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
+ "SELECT DISTINCT ?root { { ?root rdf:type ?ATYPE } UNION { ?root rdf:type ?t . ?t rdfs:subClassOf ?ATYPE } }") ;
+ Query q = QueryFactory.create(s) ;
+ QuerySolutionMap qsm = new QuerySolutionMap() ;
+ qsm.add("ATYPE", atype) ;
+ try(QueryExecution qExec = QueryExecutionFactory.create(q, model, qsm)) {
+ return ListUtils.toList(
+ QueryExecUtils.getAll(qExec, "root").stream().map(r->(Resource)r));
+
+ }
+ }
+
public static String fmtURI(Resource r) {
return r.getModel().shortForm(r.getURI()) ;
}
[2/2] jena git commit: Tidy javadoc and comments
Posted by an...@apache.org.
Tidy javadoc and comments
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6dac178f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6dac178f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6dac178f
Branch: refs/heads/master
Commit: 6dac178f813239f9d7145f03b1538b0dcb289295
Parents: a8a3ce4
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Aug 1 22:06:47 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Aug 1 22:06:47 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/sparql/expr/NodeValue.java | 6 ++----
jena-cmds/src/main/java/arq/cmdline/ModAssembler.java | 1 +
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6dac178f/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 718a973..d1c2317 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -585,13 +585,11 @@ public abstract class NodeValue extends ExprNode
* Supports <, <=, >, >= but not = nor != (which are sameValueAs and notSameValueAs)
* @param nv1
* @param nv2
- * @return negative, 0 , or positive for not possible, less than, equal, greater than.
+ * @return Expr.CMP_INDETERMINATE(+2), Expr.CMP_LESS(-1), Expr.CMP_EQUAL(0) or Expr.CMP_GREATER(+1)
* @throws ExprNotComparableException
*/
public static int compare(NodeValue nv1, NodeValue nv2)
{
- // Called from E_LessThat etc
- // and NodeUtils.comparLiteralsByValue
if ( nv1 == null || nv2 == null )
//raise(new ExprEvalException("Attempt to notSameValueAs on null") ;
throw new ARQInternalErrorException("Attempt to compare on null") ;
@@ -622,7 +620,7 @@ public abstract class NodeValue extends ExprNode
ValueSpaceClassification compType = classifyValueOp(nv1, nv2) ;
// Special case - date/dateTime comparison is affected by timezones and may be
- // interdeterminate based on the value of the dateTime/date.
+ // indeterminate based on the value of the dateTime/date.
// Do this first,
switch (compType)
http://git-wip-us.apache.org/repos/asf/jena/blob/6dac178f/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java b/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
index 30e4573..072c954 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
@@ -34,6 +34,7 @@ import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
public class ModAssembler extends ModBase
{
public static final ArgDecl assemblerDescDecl = new ArgDecl(ArgDecl.HasValue, "desc", "dataset") ;
+
private String assemblerFile = null ;
Object thingDescribed = null ;