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 2013/06/15 12:23:23 UTC
svn commit: r1493337 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
Author: andy
Date: Sat Jun 15 10:23:23 2013
New Revision: 1493337
URL: http://svn.apache.org/r1493337
Log:
Reformat
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1493337&r1=1493336&r2=1493337&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java Sat Jun 15 10:23:23 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.sparql.algebra;
+package com.hp.hpl.jena.sparql.algebra ;
import java.util.Collection ;
import java.util.Iterator ;
@@ -33,116 +33,93 @@ import com.hp.hpl.jena.sparql.core.Quad
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArg ;
-/** Get vars for a pattern */
+/** Get vars for a pattern */
public class OpVars
{
/** @deprecated use {@linkplain #visibleVars} */
@Deprecated
- public static Set<Var> patternVars(Op op) { return visibleVars(op) ; }
-
- // Choose the default collector - LinkedHashSet is predictable and keeps the "found" order
- private static Set<Var> collector() { return new LinkedHashSet<Var>() ; }
-
- public static Set<Var> visibleVars(Op op)
- {
+ public static Set<Var> patternVars(Op op) {
+ return visibleVars(op) ;
+ }
+
+ // Choose the default collector - LinkedHashSet is predictable and
+ // keeps the "found" order
+ private static Set<Var> collector() {
+ return new LinkedHashSet<Var>() ;
+ }
+
+ public static Set<Var> visibleVars(Op op) {
Set<Var> acc = collector() ;
visibleVars(op, acc) ;
- return acc ;
+ return acc ;
}
-
- public static void visibleVars(Op op, Set<Var> acc)
- {
+
+ public static void visibleVars(Op op, Set<Var> acc) {
OpVarsPattern visitor = new OpVarsPattern(acc, true) ;
OpWalker.walk(new WalkerVisitorVisible(visitor, acc), op) ;
}
// All mentioned variables regardless of scope/visibility.
- public static Collection<Var> mentionedVars(Op op)
- {
+ public static Collection<Var> mentionedVars(Op op) {
Set<Var> acc = collector() ;
mentionedVars(op, acc) ;
return acc ;
}
// All mentioned variables regardless of scope/visibility.
- public static void mentionedVars(Op op, Set<Var> acc)
- {
+ public static void mentionedVars(Op op, Set<Var> acc) {
OpVarsMentioned visitor = new OpVarsMentioned(acc) ;
OpWalker.walk(op, visitor) ;
}
-
- public static Collection<Var> vars(BasicPattern pattern)
- {
+
+ public static Collection<Var> vars(BasicPattern pattern) {
Set<Var> acc = collector() ;
vars(pattern, acc) ;
return acc ;
}
-
- public static void vars(BasicPattern pattern, Collection<Var> acc)
- {
- for ( Triple triple : pattern )
+
+ public static void vars(BasicPattern pattern, Collection<Var> acc) {
+ for (Triple triple : pattern)
addVarsFromTriple(acc, triple) ;
}
-
/** Do project and don't walk into it. MINUS vars aren't visiible either */
private static class WalkerVisitorVisible extends WalkerVisitor
{
private final Collection<Var> acc ;
- public WalkerVisitorVisible(OpVarsPattern visitor, Collection<Var> acc)
- {
+ public WalkerVisitorVisible(OpVarsPattern visitor, Collection<Var> acc) {
super(visitor) ;
this.acc = acc ;
}
@Override
- public void visit(OpProject op)
- {
+ public void visit(OpProject op) {
before(op) ;
// Skip Project subop.
acc.addAll(op.getVars()) ;
- after(op) ;
+ after(op) ;
}
@Override
- public void visit(OpMinus op)
- {
+ public void visit(OpMinus op) {
before(op) ;
- if ( op.getLeft() != null ) op.getLeft().visit(this) ;
+ if (op.getLeft() != null)
+ op.getLeft().visit(this) ;
// Skip right.
- //if ( op.getRight() != null ) op.getRight().visit(this) ;
- if ( visitor != null ) op.visit(visitor) ;
- after(op) ;
- }
- }
-
-// /** Don't accumulate RHS of OpMinus*/
-// private static class WalkerVisitorVisible extends WalkerVisitorProjectDirect
-// {
-// public WalkerVisitorVisible(OpVarsPattern visitor, Collection<Var> acc)
-// {
-// super(visitor, acc) ;
-// }
-//
-// @Override
-// public void visit(OpMinus op)
-// {
-// before(op) ;
-// if ( op.getLeft() != null ) op.getLeft().visit(this) ;
-// // Skip right.
-// //if ( op.getRight() != null ) op.getRight().visit(this) ;
-// if ( visitor != null ) op.visit(visitor) ;
-// after(op) ;
-// }
-// }
-
+ // if ( op.getRight() != null ) op.getRight().visit(this) ;
+ if (visitor != null)
+ op.visit(visitor) ;
+ after(op) ;
+ }
+ }
+
private static class OpVarsPattern extends OpVisitorBase
{
// The possibly-set-vars
protected Set<Var> acc ;
- final boolean visibleOnly ;
+ final boolean visibleOnly ;
OpVarsPattern(Set<Var> acc, boolean visibleOnly) {
this.acc = acc ;
@@ -150,145 +127,127 @@ public class OpVars
}
@Override
- public void visit(OpBGP opBGP)
- {
+ public void visit(OpBGP opBGP) {
vars(opBGP.getPattern(), acc) ;
}
-
+
@Override
- public void visit(OpPath opPath)
- {
+ public void visit(OpPath opPath) {
addVar(acc, opPath.getTriplePath().getSubject()) ;
addVar(acc, opPath.getTriplePath().getObject()) ;
}
@Override
- public void visit(OpQuadPattern quadPattern)
- {
+ public void visit(OpQuadPattern quadPattern) {
addVar(acc, quadPattern.getGraphNode()) ;
vars(quadPattern.getBasicPattern(), acc) ;
- // Pure quading
-// for ( Iterator iter = quadPattern.getQuads().iterator() ; iter.hasNext() ; )
-// {
-// Quad quad = (Quad)iter.next() ;
+// // Pure quading
+// for (Iterator<Quad> iter = quadPattern.getQuads().iterator(); iter.hasNext();) {
+// Quad quad = iter.next() ;
// addVarsFromQuad(acc, quad) ;
// }
}
@Override
- public void visit(OpGraph opGraph)
- {
+ public void visit(OpGraph opGraph) {
addVar(acc, opGraph.getNode()) ;
}
@Override
- public void visit(OpDatasetNames dsNames)
- {
+ public void visit(OpDatasetNames dsNames) {
addVar(acc, dsNames.getGraphNode()) ;
}
-
+
@Override
- public void visit(OpTable opTable)
- {
+ public void visit(OpTable opTable) {
// Only the variables with values in the tables
- // (When building, undefs didn't get into bindings so no variable mentioned)
+ // (When building, undefs didn't get into bindings so no variable
+ // mentioned)
Table t = opTable.getTable() ;
- acc.addAll(t.getVars());
+ acc.addAll(t.getVars()) ;
}
-
+
@Override
- public void visit(OpProject opProject)
- {
+ public void visit(OpProject opProject) {
// The walker (WalerVisitorVisible) handles this
// for visible variables, not mentioned variable colelcting.
- // The visibleOnly/clear is simply to be as general as possible.
- if ( visibleOnly )
+ // The visibleOnly/clear is simply to be as general as possible.
+ if (visibleOnly)
acc.clear() ;
acc.addAll(opProject.getVars()) ;
}
-
+
@Override
- public void visit(OpAssign opAssign)
- {
+ public void visit(OpAssign opAssign) {
acc.addAll(opAssign.getVarExprList().getVars()) ;
}
-
+
@Override
- public void visit(OpExtend opExtend)
- {
+ public void visit(OpExtend opExtend) {
acc.addAll(opExtend.getVarExprList().getVars()) ;
}
-
+
@Override
- public void visit(OpPropFunc opPropFunc)
- {
+ public void visit(OpPropFunc opPropFunc) {
addvars(opPropFunc.getSubjectArgs()) ;
addvars(opPropFunc.getObjectArgs()) ;
}
-
- private void addvars(PropFuncArg pfArg)
- {
- if ( pfArg.isNode() )
- {
+
+ private void addvars(PropFuncArg pfArg) {
+ if (pfArg.isNode()) {
addVar(acc, pfArg.getArg()) ;
return ;
}
- for ( Node n : pfArg.getArgList() )
- addVar(acc,n) ;
+ for (Node n : pfArg.getArgList())
+ addVar(acc, n) ;
}
-
+
@Override
- public void visit(OpProcedure opProc)
- {
+ public void visit(OpProcedure opProc) {
opProc.getArgs().varsMentioned(acc) ;
}
}
-
+
private static class OpVarsMentioned extends OpVarsPattern
{
- OpVarsMentioned(Set<Var> acc) { super(acc, false) ; }
+ OpVarsMentioned(Set<Var> acc) {
+ super(acc, false) ;
+ }
@Override
- public void visit(OpFilter opFilter)
- {
- opFilter.getExprs().varsMentioned(acc);
+ public void visit(OpFilter opFilter) {
+ opFilter.getExprs().varsMentioned(acc) ;
}
@Override
- public void visit(OpOrder opOrder)
- {
- for ( Iterator<SortCondition> iter = opOrder.getConditions().iterator() ; iter.hasNext(); )
- {
- SortCondition sc = iter.next();
+ public void visit(OpOrder opOrder) {
+ for (Iterator<SortCondition> iter = opOrder.getConditions().iterator(); iter.hasNext();) {
+ SortCondition sc = iter.next() ;
Set<Var> x = sc.getExpression().getVarsMentioned() ;
acc.addAll(x) ;
}
}
-
}
- private static void addVarsFromTriple(Collection<Var> acc, Triple t)
- {
+ private static void addVarsFromTriple(Collection<Var> acc, Triple t) {
addVar(acc, t.getSubject()) ;
addVar(acc, t.getPredicate()) ;
addVar(acc, t.getObject()) ;
}
-
- private static void addVarsFromQuad(Collection<Var> acc, Quad q)
- {
+
+ private static void addVarsFromQuad(Collection<Var> acc, Quad q) {
addVar(acc, q.getSubject()) ;
addVar(acc, q.getPredicate()) ;
addVar(acc, q.getObject()) ;
addVar(acc, q.getGraph()) ;
}
-
- private static void addVar(Collection<Var> acc, Node n)
- {
- if ( n == null )
+
+ private static void addVar(Collection<Var> acc, Node n) {
+ if (n == null)
return ;
-
- if ( n.isVariable() )
+
+ if (n.isVariable())
acc.add(Var.alloc(n)) ;
}
}