svn commit: r1512479 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine: QueryEngineBase.java main/QueryEngineMain.java

[andy]

Author: andy
Date: Fri Aug  9 20:23:22 2013
New Revision: 1512479

URL: http://svn.apache.org/r1512479
Log:
JENA-500
Substitute for variables before optimization.

Modified:
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java?rev=1512479&r1=1512478&r2=1512479&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryEngineBase.java
 Fri Aug  9 20:23:22 2013
@@ -93,7 +93,7 @@ public abstract class QueryEngineBase im
     {
         // Decide the algebra to actually execute.
         Op op = queryOp ;
-        if ( false && ! startBinding.isEmpty() ) {
+        if ( ! startBinding.isEmpty() ) {
             op = Substitute.substitute(op, startBinding) ;
             context.put(ARQConstants.sysCurrentAlgebra, op) ;
             // Don't reset the startBinding because it also is

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java?rev=1512479&r1=1512478&r2=1512479&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
 Fri Aug  9 20:23:22 2013
@@ -24,13 +24,7 @@ import com.hp.hpl.jena.sparql.algebra.Al
 import com.hp.hpl.jena.sparql.algebra.Op ;
 import com.hp.hpl.jena.sparql.algebra.optimize.TransformScopeRename ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Substitute ;
-import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
-import com.hp.hpl.jena.sparql.engine.Plan ;
-import com.hp.hpl.jena.sparql.engine.QueryEngineBase ;
-import com.hp.hpl.jena.sparql.engine.QueryEngineFactory ;
-import com.hp.hpl.jena.sparql.engine.QueryEngineRegistry ;
-import com.hp.hpl.jena.sparql.engine.QueryIterator ;
+import com.hp.hpl.jena.sparql.engine.* ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
 import com.hp.hpl.jena.sparql.engine.iterator.QueryIterRoot ;
 import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorCheck ;
@@ -51,15 +45,9 @@ public class QueryEngineMain extends Que
         super(query, dataset, input, context) ;
     }
 
-    // This does initial bindings by substituting immediately, rather than 
flowing the binding only.
-    public static boolean SUBSTITUE = true ;
-    
     @Override
     public QueryIterator eval(Op op, DatasetGraph dsg, Binding input, Context 
context)
     {
-        if ( SUBSTITUE && ! input.isEmpty() )
-            op = Substitute.substitute(op, input) ;
-        
         ExecutionContext execCxt = new ExecutionContext(context, 
dsg.getDefaultGraph(), dsg, QC.getFactory(context)) ;
         QueryIterator qIter1 = QueryIterRoot.create(input, execCxt) ;
         QueryIterator qIter = QC.execute(op, qIter1, execCxt) ;