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 2015/09/13 18:51:26 UTC
jena git commit: JENA-1023: Enable hash-based left join.
Repository: jena
Updated Branches:
refs/heads/master 05c9eae48 -> 9ef4b0589
JENA-1023: Enable hash-based left join.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9ef4b058
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9ef4b058
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9ef4b058
Branch: refs/heads/master
Commit: 9ef4b05891fb6fcc96e2ee73f2e30d7b0e289bc0
Parents: 05c9eae
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Sep 13 17:51:23 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Sep 13 17:51:23 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/engine/join/Join.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9ef4b058/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
index ed25af6..cb9d88c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
@@ -72,11 +72,13 @@ public class Join {
if ( false )
return debug(left, right, execCxt,
(_left, _right)->nestedLoopLeftJoin(_left, _right, conditions, execCxt)) ;
- // XXX When had left join ready ...
-// if ( useNestedLoopJoin )
-// return nestedLoopLeftJoin(left, right, conditions, execCxt) ;
-// return hashLeftJoin(left, right, execCxt) ;
- return nestedLoopLeftJoin(left, right, conditions, execCxt) ;
+ if ( useNestedLoopLeftJoin )
+ return nestedLoopLeftJoin(left, right, conditions, execCxt) ;
+ return hashLeftJoin(left, right, conditions, execCxt) ;
+ }
+
+ private static QueryIterator hashLeftJoin(QueryIterator left, QueryIterator right, ExprList conditions, ExecutionContext execCxt) {
+ return QueryIterHashLeftJoin_Right.create(left, right, conditions, execCxt) ;
}
/* Debug.
@@ -117,6 +119,7 @@ public class Join {
* @return QueryIterator
*/
public static QueryIterator hashJoin(QueryIterator left, QueryIterator right, ExecutionContext execCxt) {
+ //return new QueryIterNestedLoopJoin(left, right, conditions, execCxt) ;
return QueryIterHashJoin.create(left, right, execCxt) ;
}