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:13:15 UTC
jena git commit: JENA-1023: Remove used indirection to old code.
Repository: jena
Updated Branches:
refs/heads/master 0fcfbe739 -> 86c35f46e
JENA-1023: Remove used indirection to old code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/86c35f46
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/86c35f46
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/86c35f46
Branch: refs/heads/master
Commit: 86c35f46e737b0f29acfb47c7de780f44e2fcb54
Parents: 0fcfbe7
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Sep 8 18:13:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Sep 8 18:13:09 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/engine/join/Join.java | 56 --------------------
1 file changed, 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/86c35f46/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 5b09544..0ccde01 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
@@ -22,18 +22,13 @@ import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.DS ;
-import org.apache.jena.atlas.lib.NotImplemented ;
import org.apache.jena.sparql.algebra.Algebra ;
-import org.apache.jena.sparql.algebra.JoinType ;
-import org.apache.jena.sparql.algebra.Table ;
-import org.apache.jena.sparql.algebra.TableFactory ;
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.QueryIterFilterExpr ;
import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
import org.apache.jena.sparql.engine.main.OpExecutor ;
-import org.apache.jena.sparql.engine.ref.TableJoin ;
import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.sparql.expr.ExprList ;
@@ -76,55 +71,6 @@ public class Join {
// return hashLeftJoin(left, right, execCxt) ;
return nestedLoopLeftJoin(left, right, conditions, execCxt) ;
}
-
-
- /**
- * Standard entry point to a join of two streams.
- * This is not a substitution/index join.
- * (See {@link OpExecutor} for streamed execution using substitution).
- * @deprecated Do not use directly.
- *
- * @param left
- * @param right
- * @param joinType
- * @param conditions
- * @param execCxt
- * @return QueryIterator
- */
- @Deprecated
- public static QueryIterator joinWorker(QueryIterator left, QueryIterator right,
- JoinType joinType, ExprList conditions,
- ExecutionContext execCxt) {
- if ( false ) {
- // Safe, and slow.
- switch(joinType) {
- case INNER: return nestedLoopJoin(left, right, execCxt) ;
- case LEFT: return nestedLoopLeftJoin(left, right, conditions, execCxt) ;
- default: throw new NotImplemented("JoinType "+joinType+" not implemented") ;
- }
- }
- if ( false ) {
- // Very safe, and slow.
- switch(joinType) {
- case INNER: return nestedLoopJoinBasic(left, right, execCxt) ;
- case LEFT: return nestedLoopLeftJoinBasic(left, right, conditions, execCxt) ;
- default: throw new NotImplemented("JoinType "+joinType+" not implemented") ;
- }
- }
-
- if ( false ) {
- // Very safe, well used old code. And slow.
- Table t = TableFactory.create(right) ;
- return TableJoin.joinWorker(left, t, joinType, conditions, execCxt) ;
- }
-
- // Normal.
- switch(joinType) {
- case INNER: return join(left, right, execCxt) ;
- case LEFT: return leftJoin(left, right, conditions, execCxt) ;
- default: throw new NotImplemented("JoinType "+joinType+" not implemented") ;
- }
- }
/** Inner loop join.
* Cancellable.
@@ -148,7 +94,6 @@ public class Join {
return new QueryIterNestedLoopLeftJoin(left, right, conditions, execCxt) ;
}
-
/** Evaluate using a hash join.
*
* @param left Left hand side
@@ -229,4 +174,3 @@ public class Join {
return qIter ;
}
}
-