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 2015/09/23 13:05:18 UTC
[1/2] jena git commit: Deal with more kinds of Op
Repository: jena
Updated Branches:
refs/heads/master bc9af2bbe -> df335ab28
Deal with more kinds of Op
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4850ad6f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4850ad6f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4850ad6f
Branch: refs/heads/master
Commit: 4850ad6fd06f913b722f05c3cac1013a27cc726a
Parents: bc9af2b
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 22 19:31:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 22 19:31:32 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/engine/main/VarFinder.java | 33 ++++++++++++++------
1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4850ad6f/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index b6824a4..9e60fae 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -291,6 +291,29 @@ public class VarFinder
@Override
public void visit(OpList opList) { mergeVars(opList.getSubOp()) ; }
+ @Override
+ public void visit(OpOrder opOrder) {
+ mergeVars(opOrder.getSubOp()) ;
+ opOrder.getConditions().forEach(sc-> {
+ sc.getExpression() ;
+ });
+ }
+
+ @Override
+ public void visit(OpGroup opGroup) {
+ // Not subOp.
+ VarExprList varExprs = opGroup.getGroupVars() ;
+ varExprs.getExprs().forEach((v,expr)->{
+ addVar(defines, v) ;
+ // Not the expressions.
+ }) ;
+ }
+
+ @Override
+ public void visit(OpDatasetNames dsNames) {
+ addVar(defines, dsNames.getGraphNode()) ;
+ }
+
// Not implemented: with checking.
private void no() {
@@ -304,19 +327,9 @@ public class VarFinder
public void visit(OpService opService) { no(); }
@Override
- public void visit(OpDatasetNames dsNames) { no(); }
-
- @Override
public void visit(OpDiff opDiff) { no(); }
-
- @Override
- public void visit(OpOrder opOrder) { no(); }
@Override
- public void visit(OpGroup opGroup) { no(); }
-
- @Override
public void visit(OpTopN opTop) { no(); }
}
-
}
[2/2] jena git commit: Ensure Assembler initialization during core
init
Posted by an...@apache.org.
Ensure Assembler initialization during core init
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/df335ab2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/df335ab2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/df335ab2
Branch: refs/heads/master
Commit: df335ab28e29061a9da6e63deefa4c56cc18b67d
Parents: 4850ad6
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Sep 23 12:05:04 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Sep 23 12:05:04 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/system/InitJenaCore.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/df335ab2/jena-core/src/main/java/org/apache/jena/system/InitJenaCore.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/InitJenaCore.java b/jena-core/src/main/java/org/apache/jena/system/InitJenaCore.java
index 83b9151..182fd74 100644
--- a/jena-core/src/main/java/org/apache/jena/system/InitJenaCore.java
+++ b/jena-core/src/main/java/org/apache/jena/system/InitJenaCore.java
@@ -18,6 +18,7 @@
package org.apache.jena.system;
+import org.apache.jena.assembler.Assembler ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -60,6 +61,10 @@ public class InitJenaCore implements JenaSubsystemLifecycle {
RDF.getURI() ;
RDFS.getURI() ;
OWL.getURI() ;
+ // Necessary. for the case of Jena first used via Assemblers
+ // Can't delay because ARQ, TDB touch Assembler for initialization.
+ // Assembler is an interface with statics final constants.
+ Assembler.general.hashCode() ;
if ( JenaSystem.DEBUG_INIT )
System.err.println("JenaCore.init - finish") ;
}