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:38 UTC
[06/20] jena git commit: Rename PLAIN as INNER.
Rename PLAIN as INNER.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/07217a37
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/07217a37
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/07217a37
Branch: refs/heads/master
Commit: 07217a37a892b0bc68c107a2e4c87f65e984ecb5
Parents: 728542a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 8 14:17:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 8 18:08:12 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/algebra/JoinType.java | 9 ++++++++-
.../org/apache/jena/sparql/engine/ref/EvaluatorSimple.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/07217a37/jena-arq/src/main/java/org/apache/jena/sparql/algebra/JoinType.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/JoinType.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/JoinType.java
index 0dc0b5b..e0bd489 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/JoinType.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/JoinType.java
@@ -18,4 +18,11 @@
package org.apache.jena.sparql.algebra;
-public enum JoinType { PLAIN, LEFT /*, RIGHT , /*FULL* /OUTER*/}
+public enum JoinType {
+ INNER /* Normal, plain equijoin*/
+ , LEFT
+ //, RIGHT
+ //, OUTER // Full outer join
+ //, ANTI // Anti-join: rows in LHS where there is no matching tuple in RHS
+ //, SEMI // All tuples in LHS where there is a matching tuple in RHS
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/07217a37/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
index 0f22aed..fb57584 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
@@ -270,7 +270,7 @@ public class EvaluatorSimple implements Evaluator
private Table joinWorker(Table tableLeft, Table tableRight, boolean leftJoin, ExprList conditions)
{
QueryIterator left = tableLeft.iterator(execCxt) ;
- JoinType joinType = (leftJoin? JoinType.LEFT : JoinType.PLAIN ) ;
+ JoinType joinType = (leftJoin? JoinType.LEFT : JoinType.INNER ) ;
QueryIterator qIter = TableJoin.joinWorker(left, tableRight, joinType, conditions, execCxt) ;
tableLeft.close() ;
tableRight.close() ;