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 2012/08/30 11:03:03 UTC
svn commit: r1378862 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
Author: andy
Date: Thu Aug 30 09:03:02 2012
New Revision: 1378862
URL: http://svn.apache.org/viewvc?rev=1378862&view=rev
Log:
Put OpDisjunction next to the similar OpUnion
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java?rev=1378862&r1=1378861&r2=1378862&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java Thu Aug 30 09:03:02 2012
@@ -249,14 +249,6 @@ public class OpExecutor
return qIter ;
}
- // Pass iterator from one step directly into the next.
- protected QueryIterator execute(OpDisjunction opDisjunction, QueryIterator input)
- {
- QueryIterator cIter = new QueryIterUnion(input, opDisjunction.getElements(), execCxt) ;
- return cIter ;
- }
-
-
protected QueryIterator execute(OpLeftJoin opLeftJoin, QueryIterator input)
{
QueryIterator left = executeOp(opLeftJoin.getLeft(), input) ;
@@ -292,6 +284,12 @@ public class OpExecutor
return new QueryIterMinus(left, right, commonVars, execCxt) ;
}
+
+ protected QueryIterator execute(OpDisjunction opDisjunction, QueryIterator input)
+ {
+ QueryIterator cIter = new QueryIterUnion(input, opDisjunction.getElements(), execCxt) ;
+ return cIter ;
+ }
protected QueryIterator execute(OpUnion opUnion, QueryIterator input)
{