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 2016/04/17 10:51:55 UTC
[3/3] jena git commit: VarFinder.process
VarFinder.process
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5b2e31f1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5b2e31f1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5b2e31f1
Branch: refs/heads/master
Commit: 5b2e31f1e100c202534da8001a6b1b7fb149454a
Parents: 6d9cd9c
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 17 09:45:30 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 17 09:45:30 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/main/JoinClassifier.java | 4 ++--
.../org/apache/jena/sparql/engine/main/LeftJoinClassifier.java | 2 +-
.../java/org/apache/jena/sparql/engine/main/VarFinder.java | 6 +++++-
.../java/org/apache/jena/sparql/algebra/TestVarFinder.java | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5b2e31f1/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
index d74d8c9..bdae14c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
@@ -88,7 +88,7 @@ public class JoinClassifier
}
// Need only check left/rght.
- VarFinder vfLeft = new VarFinder(leftOp) ;
+ VarFinder vfLeft = VarFinder.process(leftOp) ;
Set<Var> vLeftFixed = vfLeft.getFixed() ;
Set<Var> vLeftOpt = vfLeft.getOpt() ;
// Set<Var> vLeftFilter = vfLeft.getFilter() ;
@@ -98,7 +98,7 @@ public class JoinClassifier
System.err.println("Left/opt: " + vLeftOpt) ;
// if (print) System.err.println("Left/filter: " + vLeftFilter) ;
- VarFinder vfRight = new VarFinder(rightOp) ;
+ VarFinder vfRight = VarFinder.process(rightOp) ;
Set<Var> vRightFixed = vfRight.getFixed() ;
Set<Var> vRightOpt = vfRight.getOpt() ;
Set<Var> vRightFilter = vfRight.getFilter() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5b2e31f1/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/LeftJoinClassifier.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/LeftJoinClassifier.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/LeftJoinClassifier.java
index c317dab..9608334 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/LeftJoinClassifier.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/LeftJoinClassifier.java
@@ -62,7 +62,7 @@ public class LeftJoinClassifier
return false ;
Set<Var> leftVars = OpVars.visibleVars(left) ;
- VarFinder vf = new VarFinder(right) ;
+ VarFinder vf = VarFinder.process(right) ;
Set<Var> optRight = vf.getOpt() ;
Set<Var> fixedRight = vf.getFixed() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5b2e31f1/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 e77f859..c9968ed 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
@@ -40,6 +40,10 @@ import org.apache.jena.sparql.util.VarUtils ;
public class VarFinder
{
+ public static VarFinder process(Op op) {
+ return new VarFinder(op) ;
+ }
+
// See also VarUtils and OpVars.
// This class is specific to the needs of the main query engine and scoping of variables
@@ -61,7 +65,7 @@ public class VarFinder
VarUsageVisitor varUsageVisitor ;
- public VarFinder(Op op)
+ private VarFinder(Op op)
{ varUsageVisitor = VarUsageVisitor.apply(op) ; }
public Set<Var> getOpt() { return varUsageVisitor.optDefines ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/5b2e31f1/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestVarFinder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestVarFinder.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestVarFinder.java
index 9145f24..aeb8332 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestVarFinder.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/TestVarFinder.java
@@ -67,7 +67,7 @@ public class TestVarFinder extends BaseTest
private static void varfind(String string, String[] varsFixed, String [] varsOpt, String [] varsFilter)
{
Op op = SSE.parseOp(string) ;
- VarFinder vf = new VarFinder(op) ;
+ VarFinder vf = VarFinder.process(op) ;
if ( varsFixed != null ) check(varsFixed, vf.getFixed()) ;
if ( varsOpt != null ) check(varsOpt, vf.getOpt()) ;
if ( varsFilter != null ) check(varsFilter, vf.getFilter()) ;