Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0769C18AE8 for ; Sun, 13 Sep 2015 16:51:27 +0000 (UTC) Received: (qmail 43540 invoked by uid 500); 13 Sep 2015 16:51:27 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 43508 invoked by uid 500); 13 Sep 2015 16:51:26 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 43437 invoked by uid 99); 13 Sep 2015 16:51:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Sep 2015 16:51:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5C2EDFC3B; Sun, 13 Sep 2015 16:51:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: jena git commit: JENA-1023: Enable hash-based left join. Date: Sun, 13 Sep 2015 16:51:26 +0000 (UTC) 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 Authored: Sun Sep 13 17:51:23 2015 +0100 Committer: Andy Seaborne 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) ; }