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/12/16 20:58:46 UTC
[1/2] jena git commit: Reformat
Repository: jena
Updated Branches:
refs/heads/master 421707f53 -> 4607faeb6
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/35a493f1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/35a493f1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/35a493f1
Branch: refs/heads/master
Commit: 35a493f16e061001b4c379e145ec5887c93ea6b4
Parents: 421707f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 16 18:56:17 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 16 18:56:17 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/Substitute.java | 411 +++++++++----------
.../java/org/apache/jena/sparql/core/Var.java | 113 +++--
2 files changed, 248 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/35a493f1/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
index b7ee827..2583b8a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
@@ -18,277 +18,258 @@
package org.apache.jena.sparql.core;
-import java.util.ArrayList ;
-import java.util.List ;
-
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.algebra.TransformCopy ;
-import org.apache.jena.sparql.algebra.Transformer ;
-import org.apache.jena.sparql.algebra.op.* ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.engine.binding.BindingFactory ;
-import org.apache.jena.sparql.expr.Expr ;
-import org.apache.jena.sparql.expr.ExprList ;
-import org.apache.jena.sparql.pfunction.PropFuncArg ;
-
-public class Substitute
-{
- public static Op substitute(Op op, Binding binding)
- {
- // Want to avoid cost if the binding is empty
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.algebra.TransformCopy;
+import org.apache.jena.sparql.algebra.Transformer;
+import org.apache.jena.sparql.algebra.op.*;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.engine.binding.BindingFactory;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprList;
+import org.apache.jena.sparql.pfunction.PropFuncArg;
+
+public class Substitute {
+ public static Op substitute(Op op, Binding binding) {
+ // Want to avoid cost if the binding is empty
// but the empty test is not zero-cost on non-empty things.
-
- if ( isNotNeeded(binding) ) return op ;
- return Transformer.transform(new OpSubstituteWorker(binding), op) ;
+
+ if ( isNotNeeded(binding) )
+ return op;
+ return Transformer.transform(new OpSubstituteWorker(binding), op);
}
-
- public static Op substitute(Op op, Var var, Node node)
- {
- Binding b = BindingFactory.binding(var, node) ;
- return substitute(op, b) ;
+
+ public static Op substitute(Op op, Var var, Node node) {
+ Binding b = BindingFactory.binding(var, node);
+ return substitute(op, b);
}
-
- public static BasicPattern substitute(BasicPattern bgp, Binding binding)
- {
- if ( isNotNeeded(binding) ) return bgp ;
-
- BasicPattern bgp2 = new BasicPattern() ;
- for ( Triple triple : bgp )
- {
- Triple t = substitute(triple, binding) ;
- bgp2.add(t) ;
+
+ public static BasicPattern substitute(BasicPattern bgp, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return bgp;
+
+ BasicPattern bgp2 = new BasicPattern();
+ for ( Triple triple : bgp ) {
+ Triple t = substitute(triple, binding);
+ bgp2.add(t);
}
- return bgp2 ;
+ return bgp2;
}
-
- public static Triple substitute(Triple triple, Binding binding)
- {
- if ( isNotNeeded(binding) ) return triple ;
-
- Node s = triple.getSubject() ;
- Node p = triple.getPredicate() ;
- Node o = triple.getObject() ;
-
- Node s1 = substitute(s, binding) ;
- Node p1 = substitute(p, binding) ;
- Node o1 = substitute(o, binding) ;
-
- Triple t = triple ;
+
+ public static Triple substitute(Triple triple, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return triple;
+
+ Node s = triple.getSubject();
+ Node p = triple.getPredicate();
+ Node o = triple.getObject();
+
+ Node s1 = substitute(s, binding);
+ Node p1 = substitute(p, binding);
+ Node o1 = substitute(o, binding);
+
+ Triple t = triple;
if ( s1 != s || p1 != p || o1 != o )
- t = new Triple(s1, p1, o1) ;
- return t ;
+ t = new Triple(s1, p1, o1);
+ return t;
}
- public static TriplePath substitute(TriplePath triplePath, Binding binding)
- {
+ public static TriplePath substitute(TriplePath triplePath, Binding binding) {
if ( triplePath.isTriple() )
- return new TriplePath(Substitute.substitute(triplePath.asTriple(), binding)) ;
-
- Node s = triplePath.getSubject() ;
- Node o = triplePath.getObject() ;
- Node s1 = substitute(s, binding) ;
- Node o1 = substitute(o, binding) ;
-
- TriplePath tp = triplePath ;
+ return new TriplePath(Substitute.substitute(triplePath.asTriple(), binding));
+
+ Node s = triplePath.getSubject();
+ Node o = triplePath.getObject();
+ Node s1 = substitute(s, binding);
+ Node o1 = substitute(o, binding);
+
+ TriplePath tp = triplePath;
if ( s1 != s || o1 != o )
- tp = new TriplePath(s1, triplePath.getPath(), o1) ;
- return tp ;
+ tp = new TriplePath(s1, triplePath.getPath(), o1);
+ return tp;
}
-
- public static Quad substitute(Quad quad, Binding binding)
- {
- if ( isNotNeeded(binding) ) return quad ;
-
- Node g = quad.getGraph() ;
- Node s = quad.getSubject() ;
- Node p = quad.getPredicate() ;
- Node o = quad.getObject() ;
-
- Node g1 = substitute(g, binding) ;
- Node s1 = substitute(s, binding) ;
- Node p1 = substitute(p, binding) ;
- Node o1 = substitute(o, binding) ;
-
- Quad q = quad ;
+
+ public static Quad substitute(Quad quad, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return quad;
+
+ Node g = quad.getGraph();
+ Node s = quad.getSubject();
+ Node p = quad.getPredicate();
+ Node o = quad.getObject();
+
+ Node g1 = substitute(g, binding);
+ Node s1 = substitute(s, binding);
+ Node p1 = substitute(p, binding);
+ Node o1 = substitute(o, binding);
+
+ Quad q = quad;
if ( s1 != s || p1 != p || o1 != o || g1 != g )
- q = new Quad(g1, s1, p1, o1) ;
- return q ;
+ q = new Quad(g1, s1, p1, o1);
+ return q;
}
-
- public static Node substitute(Node n, Binding b)
- {
- return Var.lookup(b, n) ;
+ public static Node substitute(Node n, Binding b) {
+ return Var.lookup(b, n);
}
-
- public static PropFuncArg substitute(PropFuncArg propFuncArg, Binding binding)
- {
- if ( isNotNeeded(binding) ) return propFuncArg ;
-
+
+ public static PropFuncArg substitute(PropFuncArg propFuncArg, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return propFuncArg;
+
if ( propFuncArg.isNode() ) {
- Node n = propFuncArg.getArg() ;
- if ( ! Var.isVar(n) )
- // Not a Var, no substitute needed.
- return propFuncArg ;
- return new PropFuncArg(substitute(propFuncArg.getArg(), binding)) ;
+ Node n = propFuncArg.getArg();
+ if ( !Var.isVar(n) )
+ // Not a Var, no substitute needed.
+ return propFuncArg;
+ return new PropFuncArg(substitute(propFuncArg.getArg(), binding));
}
-
- List<Node> newArgList = new ArrayList<>() ;
+
+ List<Node> newArgList = new ArrayList<>();
for ( Node n : propFuncArg.getArgList() )
- newArgList.add(substitute(n, binding)) ;
- return new PropFuncArg(newArgList) ;
+ newArgList.add(substitute(n, binding));
+ return new PropFuncArg(newArgList);
}
-
- public static Expr substitute(Expr expr, Binding binding)
- {
- if ( isNotNeeded(binding) ) return expr ;
- return expr.copySubstitute(binding) ;
+
+ public static Expr substitute(Expr expr, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return expr;
+ return expr.copySubstitute(binding);
}
-
- public static ExprList substitute(ExprList exprList, Binding binding)
- {
- if ( isNotNeeded(binding) ) return exprList ;
- return exprList.copySubstitute(binding) ;
+
+ public static ExprList substitute(ExprList exprList, Binding binding) {
+ if ( isNotNeeded(binding) )
+ return exprList;
+ return exprList.copySubstitute(binding);
}
-
- private static boolean isNotNeeded(Binding b)
- {
- return b == null || b.isEmpty() ;
+
+ private static boolean isNotNeeded(Binding b) {
+ return b == null || b.isEmpty();
}
-
+
// ----
- private static class OpSubstituteWorker extends TransformCopy
- {
- private Binding binding ;
-
- public OpSubstituteWorker(Binding binding)
- {
- super(TransformCopy.COPY_ALWAYS) ;
- this.binding = binding ;
+ private static class OpSubstituteWorker extends TransformCopy {
+ private Binding binding;
+
+ public OpSubstituteWorker(Binding binding) {
+ super(TransformCopy.COPY_ALWAYS);
+ this.binding = binding;
}
@Override
- public Op transform(OpBGP opBGP)
- {
- BasicPattern bgp = opBGP.getPattern() ;
- bgp = substitute(bgp, binding) ;
- return new OpBGP(bgp) ;
+ public Op transform(OpBGP opBGP) {
+ BasicPattern bgp = opBGP.getPattern();
+ bgp = substitute(bgp, binding);
+ return new OpBGP(bgp);
}
@Override
- public Op transform(OpQuadPattern quadPattern)
- {
- Node gNode = quadPattern.getGraphNode() ;
- Node g = substitute(gNode, binding) ;
-
- BasicPattern triples = new BasicPattern() ;
- for ( Triple triple : quadPattern.getBasicPattern() )
- {
- Node s = substitute(triple.getSubject(), binding) ;
- Node p = substitute(triple.getPredicate(), binding) ;
- Node o = substitute(triple.getObject(), binding) ;
- Triple t = new Triple(s, p, o) ;
- triples.add(t) ;
+ public Op transform(OpQuadPattern quadPattern) {
+ Node gNode = quadPattern.getGraphNode();
+ Node g = substitute(gNode, binding);
+
+ BasicPattern triples = new BasicPattern();
+ for ( Triple triple : quadPattern.getBasicPattern() ) {
+ Node s = substitute(triple.getSubject(), binding);
+ Node p = substitute(triple.getPredicate(), binding);
+ Node o = substitute(triple.getObject(), binding);
+ Triple t = new Triple(s, p, o);
+ triples.add(t);
}
-
+
// Pure quading.
-// for ( Iterator iter = quadPattern.getQuads().iterator() ; iter.hasNext() ; )
-// {
-// Quad quad = (Quad)iter.next() ;
-// if ( ! quad.getGraph().equals(gNode) )
-// throw new ARQInternalErrorException("Internal error: quads block is not uniform over the graph node") ;
-// Node s = substitute(quad.getSubject(), binding) ;
-// Node p = substitute(quad.getPredicate(), binding) ;
-// Node o = substitute(quad.getObject(), binding) ;
-// Triple t = new Triple(s, p, o) ;
-// triples.add(t) ;
-// }
-
- return new OpQuadPattern(g, triples) ;
+ // for ( Iterator iter = quadPattern.getQuads().iterator() ;
+ // iter.hasNext() ; )
+ // {
+ // Quad quad = (Quad)iter.next() ;
+ // if ( ! quad.getGraph().equals(gNode) )
+ // throw new ARQInternalErrorException("Internal error: quads block
+ // is not uniform over the graph node") ;
+ // Node s = substitute(quad.getSubject(), binding) ;
+ // Node p = substitute(quad.getPredicate(), binding) ;
+ // Node o = substitute(quad.getObject(), binding) ;
+ // Triple t = new Triple(s, p, o) ;
+ // triples.add(t) ;
+ // }
+
+ return new OpQuadPattern(g, triples);
}
@Override
- public Op transform(OpPath opPath)
- {
- return new OpPath(substitute(opPath.getTriplePath(), binding)) ;
+ public Op transform(OpPath opPath) {
+ return new OpPath(substitute(opPath.getTriplePath(), binding));
}
@Override
- public Op transform(OpPropFunc opPropFunc, Op subOp)
- {
- PropFuncArg sArgs = opPropFunc.getSubjectArgs() ;
- PropFuncArg oArgs = opPropFunc.getObjectArgs() ;
-
- PropFuncArg sArgs2 = substitute(sArgs, binding) ;
- PropFuncArg oArgs2 = substitute(oArgs, binding) ;
-
- if ( sArgs2 == sArgs && oArgs2 == oArgs && opPropFunc.getSubOp() == subOp)
- return super.transform(opPropFunc, subOp) ;
- return new OpPropFunc(opPropFunc.getProperty(), sArgs2, oArgs2, subOp) ;
+ public Op transform(OpPropFunc opPropFunc, Op subOp) {
+ PropFuncArg sArgs = opPropFunc.getSubjectArgs();
+ PropFuncArg oArgs = opPropFunc.getObjectArgs();
+
+ PropFuncArg sArgs2 = substitute(sArgs, binding);
+ PropFuncArg oArgs2 = substitute(oArgs, binding);
+
+ if ( sArgs2 == sArgs && oArgs2 == oArgs && opPropFunc.getSubOp() == subOp )
+ return super.transform(opPropFunc, subOp);
+ return new OpPropFunc(opPropFunc.getProperty(), sArgs2, oArgs2, subOp);
}
-
+
@Override
- public Op transform(OpFilter filter, Op op)
- {
- ExprList exprs = filter.getExprs().copySubstitute(binding) ;
+ public Op transform(OpFilter filter, Op op) {
+ ExprList exprs = filter.getExprs().copySubstitute(binding);
if ( exprs == filter.getExprs() )
- return filter ;
- return OpFilter.filter(exprs, op) ;
+ return filter;
+ return OpFilter.filter(exprs, op);
}
@Override
- public Op transform(OpAssign opAssign, Op subOp)
- {
- VarExprList varExprList2 = transformVarExprList(opAssign.getVarExprList()) ;
+ public Op transform(OpAssign opAssign, Op subOp) {
+ VarExprList varExprList2 = transformVarExprList(opAssign.getVarExprList());
if ( varExprList2.isEmpty() )
- return subOp ;
- return OpAssign.assign(subOp, varExprList2) ;
+ return subOp;
+ return OpAssign.assign(subOp, varExprList2);
}
-
+
@Override
- public Op transform(OpExtend opExtend, Op subOp)
- {
- VarExprList varExprList2 = transformVarExprList(opExtend.getVarExprList()) ;
+ public Op transform(OpExtend opExtend, Op subOp) {
+ VarExprList varExprList2 = transformVarExprList(opExtend.getVarExprList());
if ( varExprList2.isEmpty() )
- return subOp ;
-
- return OpExtend.create(subOp, varExprList2) ;
+ return subOp;
+
+ return OpExtend.create(subOp, varExprList2);
}
-
- private VarExprList transformVarExprList(VarExprList varExprList)
- {
- VarExprList varExprList2 = new VarExprList() ;
- for ( Var v : varExprList.getVars() )
- {
-// if ( binding.contains(v))
-// // Already bound. No need to do anything because the
-// // logical assignment will test value.
-// continue ;
- Expr expr = varExprList.getExpr(v) ;
- expr = expr.copySubstitute(binding) ;
- varExprList2.add(v, expr) ;
+
+ private VarExprList transformVarExprList(VarExprList varExprList) {
+ VarExprList varExprList2 = new VarExprList();
+ for ( Var v : varExprList.getVars() ) {
+ // if ( binding.contains(v))
+ // // Already bound. No need to do anything because the
+ // // logical assignment will test value.
+ // continue ;
+ Expr expr = varExprList.getExpr(v);
+ expr = expr.copySubstitute(binding);
+ varExprList2.add(v, expr);
}
- return varExprList2 ;
+ return varExprList2;
}
-
// The expression?
- //public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) { return xform(opLeftJoin, left, right) ; }
-
+ // public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) {
+ // return xform(opLeftJoin, left, right) ; }
+
@Override
- public Op transform(OpGraph op, Op sub)
- {
- Node n = substitute(op.getNode(), binding) ;
- return new OpGraph(n, sub) ;
+ public Op transform(OpGraph op, Op sub) {
+ Node n = substitute(op.getNode(), binding);
+ return new OpGraph(n, sub);
}
@Override
- public Op transform(OpService op, Op sub)
- {
- Node n = substitute(op.getService(), binding) ;
- return new OpService(n, sub, op.getSilent()) ;
+ public Op transform(OpService op, Op sub) {
+ Node n = substitute(op.getService(), binding);
+ return new OpService(n, sub, op.getSilent());
}
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/35a493f1/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
index 57d81a0..a902d78 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
@@ -41,50 +41,47 @@ public class Var extends Node_Variable
// object, not just the same name, to be anonymous.
public static Var ANON = new Var("?_") ;
- public static Var alloc(String varName)
- {
+ public static Var alloc(String varName) {
// if ( varName.equals("_") )
// return ANON ;
return new Var(varName) ;
}
- public static Var alloc(Node_Variable v) // asVar?
- {
+ public static Var alloc(Node_Variable v) // asVar?
+ {
if ( v instanceof Var )
- return (Var)v ;
- return new Var(v) ;
+ return (Var)v;
+ return new Var(v);
}
- public static Var alloc(Node v)
- {
+ public static Var alloc(Node v) {
if ( v instanceof Var )
- return (Var)v ;
+ return (Var)v;
if ( v instanceof Node_Variable )
- return new Var((Node_Variable)v) ;
- throw new NotAVariableException("Node: "+v) ;
+ return new Var((Node_Variable)v);
+ throw new NotAVariableException("Node: " + v);
}
-
- public static Var alloc(Var v)
- {
- return v ;
+
+ public static Var alloc(Var v) {
+ return v;
}
-
+
public static Var alloc(ExprVar nv) { return new Var(nv) ; }
- public static Node lookup(Binding binding, Node node)
- {
- if ( ! Var.isVar(node) )
- return node ;
- Var var = Var.alloc(node) ;
- return lookup(binding, var) ;
+ /** Return the value in the binding (if node is a Var) or the node itself. */
+ public static Node lookup(Binding binding, Node node) {
+ if ( !Var.isVar(node) )
+ return node;
+ Var var = Var.alloc(node);
+ return lookup(binding, var);
}
-
- public static Node lookup(Binding binding, Var var)
- {
- Node n = binding.get(var) ;
+
+ /** Return the value in the binding or the variable itself. */
+ public static Node lookup(Binding binding, Var var) {
+ Node n = binding.get(var);
if ( n != null )
- return n ;
- return var ;
+ return n;
+ return var;
}
// Precalulated the hash code because hashCode() is used so heavily with Var's
@@ -92,7 +89,7 @@ public class Var extends Node_Variable
private Var(String varName) { super(varName) ; hashCodeValue = super.hashCode() ; }
- private Var(Node_Variable v) { this( v.getName() ) ; }
+ private Var(Node_Variable v) { this(v.getName()) ; }
private Var(ExprVar v) { this(v.getVarName()) ; }
@@ -101,8 +98,7 @@ public class Var extends Node_Variable
public String getVarName() { return getName() ; }
- static class NotAVariableException extends ARQInternalErrorException
- {
+ static class NotAVariableException extends ARQInternalErrorException {
NotAVariableException(String msg) { super(msg) ; }
}
@@ -110,8 +106,7 @@ public class Var extends Node_Variable
public final int hashCode() { return hashCodeValue ; }
@Override
- public final boolean equals(Object other)
- {
+ public final boolean equals(Object other) {
if ( this == other ) return true ;
if ( ! ( other instanceof Var ) ) return false ;
return super.equals(other) ;
@@ -130,21 +125,20 @@ public class Var extends Node_Variable
// -------
- public static String canonical(String x)
- {
+ public static String canonical(String x) {
if ( x.startsWith("?") )
- return x.substring(1) ;
+ return x.substring(1);
if ( x.startsWith("$") )
- return x.substring(1) ;
- return x ;
+ return x.substring(1);
+ return x;
}
- public static boolean isVar(Node node)
- {
- if ( node instanceof Var ) return true ;
+ public static boolean isVar(Node node) {
+ if ( node instanceof Var )
+ return true;
if ( node != null && node.isVariable() )
- throw new NotAVariableException("Node_variable (not a Var) found") ;
- return false ;
+ throw new NotAVariableException("Node_variable (not a Var) found");
+ return false;
}
public static boolean isRenamedVar(Node node)
@@ -172,25 +166,22 @@ public class Var extends Node_Variable
{ return x.startsWith(ARQConstants.allocVarMarker) ; }
/** Convert a collection of variable names to variables */
- public static List<Var> varList(Collection<String> varNames)
- {
- List<Var> x = new ArrayList<>() ;
- for (String obj : varNames)
- x.add(Var.alloc(obj)) ;
- return x ;
+ public static List<Var> varList(Collection<String> varNames) {
+ List<Var> x = new ArrayList<>();
+ for ( String obj : varNames )
+ x.add(Var.alloc(obj));
+ return x;
}
-
- public static boolean isAnonVar(Var var)
- {
- return var == ANON ;
+
+ public static boolean isAnonVar(Var var) {
+ return var == ANON;
}
-
- /** Return a list of String names from a collection of variables */
- public static List<String> varNames(Collection<Var> vars)
- {
- List<String> x = new ArrayList<>() ;
- for (Var var : vars)
- x.add(var.getVarName()) ;
- return x ;
+
+ /** Return a list of String names from a collection of variables */
+ public static List<String> varNames(Collection<Var> vars) {
+ List<String> x = new ArrayList<>();
+ for ( Var var : vars )
+ x.add(var.getVarName());
+ return x;
}
}
[2/2] jena git commit: Reformat
Posted by an...@apache.org.
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4607faeb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4607faeb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4607faeb
Branch: refs/heads/master
Commit: 4607faeb6e22561d3924170b1c16bf5d7ef1fa56
Parents: 35a493f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 16 19:57:37 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 16 19:57:37 2015 +0000
----------------------------------------------------------------------
.../sparql/engine/iterator/QueryIterAssign.java | 49 ++++++++------------
.../engine/iterator/QueryIterExtendByVar.java | 35 ++++++--------
2 files changed, 35 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4607faeb/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
index da903a2..2e71958 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
@@ -39,13 +39,11 @@ public class QueryIterAssign extends QueryIterProcessBinding
private VarExprList exprs ;
private final boolean mustBeNewVar ;
- public QueryIterAssign(QueryIterator input, Var var, Expr expr, ExecutionContext qCxt)
- {
+ public QueryIterAssign(QueryIterator input, Var var, Expr expr, ExecutionContext qCxt) {
this(input, new VarExprList(var, expr) , qCxt, false) ;
}
- public QueryIterAssign(QueryIterator input, VarExprList exprs, ExecutionContext qCxt, boolean mustBeNewVar)
- {
+ public QueryIterAssign(QueryIterator input, VarExprList exprs, ExecutionContext qCxt, boolean mustBeNewVar) {
// mustBeNewVar : any variable introduced must not already exist.
// true => BIND
// false => LET
@@ -56,29 +54,24 @@ public class QueryIterAssign extends QueryIterProcessBinding
}
@Override
- public Binding accept(Binding binding)
- {
- BindingMap b = BindingFactory.create(binding) ;
- for ( Var v : exprs.getVars() )
- {
- // Not this, where expressions do not see the new bindings.
- // Node n = exprs.get(v, bind, funcEnv) ;
- // which gives (Lisp) "let" semantics, not "let*" semantics
- Node n = exprs.get(v, b, getExecContext()) ;
-
+ public Binding accept(Binding binding) {
+ BindingMap b = BindingFactory.create(binding);
+ for ( Var v : exprs.getVars() ) {
+ // if "binding", not "b" used, we get (Lisp) "let"
+ // semantics, not the desired "let*" semantics
+ Node n = exprs.get(v, b, getExecContext());
+
if ( n == null )
// Expression failed to evaluate - no assignment
- continue ;
-
+ continue;
+
// Check is already has a value; if so, must be sameValueAs
- if ( b.contains(v) )
- {
- // Optimization may linearize to push a stream through an (extend).
+ if ( b.contains(v) ) {
+ // Optimization may linearize to push a stream through an (extend).
if ( false && mustBeNewVar )
- throw new QueryExecException("Already set: "+v) ;
-
- Node n2 = b.get(v) ;
- if ( ! n2.sameValueAs(n) )
+ throw new QueryExecException("Already set: " + v);
+ Node n2 = b.get(v);
+ if ( !n2.sameValueAs(n) )
//throw new QueryExecException("Already set: "+v) ;
// Error in single assignment.
return null ;
@@ -90,11 +83,9 @@ public class QueryIterAssign extends QueryIterProcessBinding
}
@Override
- protected void details(IndentedWriter out, SerializationContext cxt)
- {
- out.print(Lib.className(this)) ;
- out.print(" ") ;
- out.print(exprs.toString()) ;
+ protected void details(IndentedWriter out, SerializationContext cxt) {
+ out.print(Lib.className(this));
+ out.print(" ");
+ out.print(exprs.toString());
}
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4607faeb/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
index f004e55..e1283ee 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
@@ -37,37 +37,32 @@ public class QueryIterExtendByVar extends QueryIter
private Var var ;
private Iterator<Node> members ;
- public QueryIterExtendByVar(Binding binding, Var var, Iterator<Node> members, ExecutionContext execCxt)
- {
- super(execCxt) ;
+ public QueryIterExtendByVar(Binding binding, Var var, Iterator<Node> members, ExecutionContext execCxt) {
+ super(execCxt);
if ( true ) { // Assume not too costly.
if ( binding.contains(var) )
- throw new ARQInternalErrorException("Var "+var+" already set in "+binding) ;
+ throw new ARQInternalErrorException("Var " + var + " already set in " + binding);
}
- this.binding = binding ;
- this.var = var ;
- this.members = members ;
+ this.binding = binding;
+ this.var = var;
+ this.members = members;
}
@Override
- protected boolean hasNextBinding()
- {
- return members.hasNext() ;
+ protected boolean hasNextBinding() {
+ return members.hasNext();
}
@Override
- protected Binding moveToNextBinding()
- {
- Node n = members.next() ;
- Binding b = BindingFactory.binding(binding, var, n) ;
- return b ;
+ protected Binding moveToNextBinding() {
+ Node n = members.next();
+ Binding b = BindingFactory.binding(binding, var, n);
+ return b;
}
@Override
- protected void closeIterator()
- { }
-
+ protected void closeIterator() {}
+
@Override
- protected void requestCancel()
- { }
+ protected void requestCancel() {}
}