jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [15/20] jena git commit: Use "Join" for OpJoin and OpLeftJoin.
Date Tue, 08 Sep 2015 17:11:57 GMT
Use "Join" for OpJoin and OpLeftJoin.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/abf68b08
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/abf68b08
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/abf68b08

Branch: refs/heads/master
Commit: abf68b081141757397a692421406c2a3291a1ed8
Parents: 1df6ee4
Author: Andy Seaborne <andy@apache.org>
Authored: Tue Sep 8 17:42:49 2015 +0100
Committer: Andy Seaborne <andy@apache.org>
Committed: Tue Sep 8 17:42:49 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/sparql/engine/main/OpExecutor.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/abf68b08/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
index 709f735..801a48e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
@@ -39,6 +39,7 @@ import org.apache.jena.sparql.engine.ExecutionContext ;
 import org.apache.jena.sparql.engine.QueryIterator ;
 import org.apache.jena.sparql.engine.binding.Binding ;
 import org.apache.jena.sparql.engine.iterator.* ;
+import org.apache.jena.sparql.engine.join.Join ;
 import org.apache.jena.sparql.engine.main.iterator.* ;
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
@@ -218,14 +219,14 @@ public class OpExecutor
         }
         QueryIterator left = exec(opJoin.getLeft(), input) ;
         QueryIterator right = exec(opJoin.getRight(), root()) ;
-        QueryIterator qIter = new QueryIterJoin(left, right, execCxt) ;
+        // Join key.
+        QueryIterator qIter = Join.join(left, right, execCxt) ;
         return qIter ;
     }
 
     // Pass iterator from one step directly into the next.
     protected QueryIterator execute(OpSequence opSequence, QueryIterator input) {
         QueryIterator qIter = input ;
-
         for (Iterator<Op> iter = opSequence.iterator(); iter.hasNext();) {
             Op sub = iter.next() ;
             qIter = exec(sub, qIter) ;
@@ -236,7 +237,7 @@ public class OpExecutor
     protected QueryIterator execute(OpLeftJoin opLeftJoin, QueryIterator input) {
         QueryIterator left = exec(opLeftJoin.getLeft(), input) ;
         QueryIterator right = exec(opLeftJoin.getRight(), root()) ;
-        QueryIterator qIter = new QueryIterLeftJoin(left, right, opLeftJoin.getExprs(), execCxt)
;
+        QueryIterator qIter = Join.leftJoin(left, right, opLeftJoin.getExprs(), execCxt)
;
         return qIter ;
     }
 


Mime
View raw message