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 2012/11/04 17:58:54 UTC
svn commit: r1405585 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra:
OpVars.java OpWalker.java Transformer.java
Author: andy
Date: Sun Nov 4 16:58:54 2012
New Revision: 1405585
URL: http://svn.apache.org/viewvc?rev=1405585&view=rev
Log:
Remove mysterious operations (that ignored some of their arguments)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpWalker.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.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=1405585&r1=1405584&r2=1405585&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 Sun Nov 4 16:58:54 2012
@@ -48,7 +48,7 @@ public class OpVars
{
//OpWalker.walk(op, new OpVarsPattern(acc)) ;
OpVisitor visitor = new OpVarsPattern(acc) ;
- OpWalker.walk(new WalkerVisitorSkipMinus(visitor), op, visitor) ;
+ OpWalker.walk(new WalkerVisitorSkipMinus(visitor), op) ;
}
public static Collection<Var> allVars(Op op)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpWalker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpWalker.java?rev=1405585&r1=1405584&r2=1405585&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpWalker.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpWalker.java Sun Nov 4 16:58:54 2012
@@ -34,25 +34,20 @@ public class OpWalker
{
public static void walk(Op op, OpVisitor visitor)
{
- walk(new WalkerVisitor(visitor, null, null), op, visitor) ;
+ walk(new WalkerVisitor(visitor, null, null), op) ;
}
public static void walk(Op op, OpVisitor visitor, OpVisitor beforeVisitor, OpVisitor afterVisitor)
{
- walk(new WalkerVisitor(visitor, beforeVisitor, afterVisitor), op, visitor, beforeVisitor, afterVisitor) ;
+ walk(new WalkerVisitor(visitor, beforeVisitor, afterVisitor), op) ;
}
- public static void walk(WalkerVisitor walkerVisitor, Op op, OpVisitor visitor)
+ public static void walk(WalkerVisitor walkerVisitor, Op op)
{
op.visit(walkerVisitor) ;
}
- public static void walk(WalkerVisitor walkerVisitor, Op op, OpVisitor visitor, OpVisitor beforeVisitor, OpVisitor afterVisitor)
- {
- op.visit(walkerVisitor) ;
- }
-
- public static class WalkerVisitor extends OpVisitorByType
+ static class WalkerVisitor extends OpVisitorByType
{
private final OpVisitor beforeVisitor ;
private final OpVisitor afterVisitor ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java?rev=1405585&r1=1405584&r2=1405585&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java Sun Nov 4 16:58:54 2012
@@ -76,7 +76,7 @@ public class Transformer
// Don't transform OpService and don't walk the sub-op
ApplyTransformVisitorServiceAsLeaf v = new ApplyTransformVisitorServiceAsLeaf(transform) ;
WalkerVisitorSkipService walker = new WalkerVisitorSkipService(v, beforeVisitor, afterVisitor) ;
- OpWalker.walk(walker, op, v) ;
+ OpWalker.walk(walker, op) ;
return v.result() ;
}
}
@@ -151,6 +151,7 @@ public class Transformer
// ----
// Algebra operations that involve an Expr, and so might include NOT EXISTS
+
@Override
public void visit(OpFilter opFilter)
@@ -195,7 +196,6 @@ public class Transformer
public void visit(OpAssign opAssign)
{
VarExprList varExpr = opAssign.getVarExprList() ;
- List<Var> vars = varExpr.getVars() ;
VarExprList varExpr2 = process(varExpr) ;
OpAssign opAssign2 = opAssign ;
if ( varExpr != varExpr2 )
@@ -203,6 +203,18 @@ public class Transformer
visit1(opAssign2) ;
}
+ @Override
+ public void visit(OpExtend opExtend)
+ {
+
+ VarExprList varExpr = opExtend.getVarExprList() ;
+ VarExprList varExpr2 = process(varExpr) ;
+ OpExtend opExtend2 = opExtend ;
+ if ( varExpr != varExpr2 )
+ opExtend2 = OpExtend.extendDirect(opExtend.getSubOp(), varExpr2) ;
+ visit1(opExtend2) ;
+ }
+
private VarExprList process(VarExprList varExpr)
{
List<Var> vars = varExpr.getVars() ;