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/04/13 21:45:36 UTC
svn commit: r1467682 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql:
algebra/AlgebraQuad.java algebra/optimize/TransformFilterPlacement.java
engine/main/OpExecutor.java expr/ExprVars.java util/QueryExecUtils.java
Author: andy
Date: Sat Apr 13 19:45:36 2013
New Revision: 1467682
URL: http://svn.apache.org/r1467682
Log:
Rename OpVars.patternVars as more accurate OpVars.visibleVars
Deprecate OpVars.allVars (unstable across renaming for scoping)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprVars.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java?rev=1467682&r1=1467681&r2=1467682&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java Sat Apr 13 19:45:36 2013
@@ -90,7 +90,7 @@ public class AlgebraQuad extends Transfo
if ( Var.isVar(gn) )
{
- Collection<Var> vars = OpVars.allVars(opGraph.getSubOp()) ;
+ Collection<Var> vars = OpVars.visibleVars(opGraph.getSubOp()) ;
if ( vars.contains(gn) )
gnQuad = varAlloc.allocVar() ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java?rev=1467682&r1=1467681&r2=1467682&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java Sat Apr 13 19:45:36 2013
@@ -118,7 +118,7 @@ public class TransformFilterPlacement ex
return transformFilterConditional(exprs, varsScope, (OpConditional)x) ;
// Not special - advance the variable scope tracking.
- OpVars.patternVars(x, varsScope) ;
+ OpVars.visibleVars(x, varsScope) ;
return x ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java?rev=1467682&r1=1467681&r2=1467682&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java Sat Apr 13 19:45:36 2013
@@ -279,8 +279,8 @@ public class OpExecutor
QueryIterator left = executeOp(lhsOp, input) ;
QueryIterator right = executeOp(rhsOp, root()) ;
- Set<Var> commonVars = OpVars.patternVars(lhsOp) ;
- commonVars.retainAll(OpVars.patternVars(rhsOp)) ;
+ Set<Var> commonVars = OpVars.visibleVars(lhsOp) ;
+ commonVars.retainAll(OpVars.visibleVars(rhsOp)) ;
return new QueryIterMinus(left, right, commonVars, execCxt) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprVars.java?rev=1467682&r1=1467681&r2=1467682&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprVars.java Sat Apr 13 19:45:36 2013
@@ -94,7 +94,7 @@ public class ExprVars
@Override
public void visit(ExprFunctionOp funcOp)
{
- Collection<Var> vars = OpVars.allVars(funcOp.getGraphPattern()) ;
+ Collection<Var> vars = OpVars.visibleVars(funcOp.getGraphPattern()) ;
for ( Var v : vars )
action.var(acc, v) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java?rev=1467682&r1=1467681&r2=1467682&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryExecUtils.java Sat Apr 13 19:45:36 2013
@@ -96,7 +96,7 @@ public class QueryExecUtils
vars = Var.varNames(((OpProject)op).getVars()) ;
else
// The variables defined in patterns (not Filters, nor NOT EXISTS, nor ORDER BY)
- vars = Var.varNames(OpVars.patternVars(op)) ;
+ vars = Var.varNames(OpVars.visibleVars(op)) ;
ResultSet results = ResultSetFactory.create(qIter, vars) ;
outputResultSet(results, null, outputFormat) ;