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/08 19:10:44 UTC
[12/20] jena git commit: Rename in JoinType.
Rename in JoinType.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6da3c8d9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6da3c8d9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6da3c8d9
Branch: refs/heads/master
Commit: 6da3c8d98cd9b8302cf760098e8a581a9e6ac4a7
Parents: eccf873
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 8 14:19:12 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 8 18:08:55 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/engine/ref/TableJoin.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6da3c8d9/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
index 483764e..acdb5cc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
@@ -44,7 +44,7 @@ import org.apache.jena.sparql.expr.ExprList ;
public class TableJoin
{
public static QueryIterator join(QueryIterator left, Table right, ExprList condition, ExecutionContext execCxt) {
- return joinWorker(left, right, PLAIN, condition, execCxt) ;
+ return joinWorker(left, right, INNER, condition, execCxt) ;
}
public static QueryIterator leftJoin(QueryIterator left, Table right, ExprList condition, ExecutionContext execCxt) {
@@ -53,7 +53,7 @@ public class TableJoin
public static QueryIterator joinWorker(QueryIterator left, Table right, JoinType joinType, ExprList conditions, ExecutionContext execCxt) {
if ( right.isEmpty() ) {
- if ( joinType == PLAIN ) {
+ if ( joinType == INNER ) {
// No rows - no match
left.close() ;
return QueryIterNullIterator.create(execCxt) ;