svn commit: r1624467 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena: query/ARQ.java sparql/algebra/optimize/Optimize.java

[an...@apache.org]

Author: andy
Date: Fri Sep 12 07:21:34 2014
New Revision: 1624467

URL: http://svn.apache.org/r1624467
Log:
Activate TransformExtendCombine

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1624467&r1=1624466&r2=1624467&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Fri Sep 12 07:21:34 2014
@@ -404,12 +404,20 @@ public class ARQ
     
     /**
      * Context key controlling whether the standard optimizater applies optimizations to joined BGPs to
-     * merge them into single BGPs
+     * merge them into single BGPs.
+     * By default, this transformation is applied.
      */
     public static final Symbol optMergeBGPs = ARQConstants.allocSymbol("optMergeBGPs");
     
+    /**
+     * Context key controlling whether the standard optimizater applies the optimization
+     * to combine stacks of (extend) into one compound operation.  Ditto (assign). 
+     * By default, this transformation is applied.
+     */
+    public static final Symbol optMergeExtends = ARQConstants.allocSymbol("optMergeExtends");
+
     /** 
-     *  Context key controlling whether the main query engine 
+     *  Context key controlling whether the main query engine processes property functions.
      *  
      */  
     public static final Symbol propertyFunctions = ARQConstants.allocSymbol("propertyFunctions") ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java?rev=1624467&r1=1624466&r2=1624467&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Fri Sep 12 07:21:34 2014
@@ -241,6 +241,10 @@ public class Optimize implements Rewrite
         if ( context.isTrueOrUndef(ARQ.optMergeBGPs) )
             op = apply("Merge BGPs", new TransformMergeBGPs(), op) ;
         
+        // Merge (extend) and (assign) stacks
+        if ( context.isTrueOrUndef(ARQ.optMergeExtends) )
+            op = apply("Merge BGPs", new TransformExtendCombine(), op) ;
+        
         // Mark
         if ( false )
             op = OpLabel.create("Transformed", op) ;