svn commit: r1541019 - in /jena/trunk/jena-arq/src: main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java

[rv...@apache.org]

Author: rvesse
Date: Tue Nov 12 12:05:49 2013
New Revision: 1541019

URL: http://svn.apache.org/r1541019
Log:
Make TransformDistinctToReduced off by default until it can be refactored to only apply when safe, also disables affected tests for now (JENA-587)

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

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=1541019&r1=1541018&r2=1541019&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 Tue Nov 12 12:05:49 2013
@@ -201,7 +201,8 @@ public class Optimize implements Rewrite
         if ( context.isTrueOrUndef(ARQ.optOrderByDistinctApplication) )
             op = apply("Apply DISTINCT prior to ORDER BY where possible", new TransformOrderByDistinctAppplication(), op);
 
-        if ( context.isTrueOrUndef(ARQ.optDistinctToReduced) )
+        // JENA-587 Temporarily only used when explicitly enabled, needs reworking to be stricter
+        if ( context.isTrue(ARQ.optDistinctToReduced) )
             op = apply("Distinct replaced with reduced", new TransformDistinctToReduced(), op) ;
         
         // Convert paths to triple patterns. 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java?rev=1541019&r1=1541018&r2=1541019&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java Tue Nov 12 12:05:49 2013
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.sparql.algebra.o
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.junit.Ignore;
 import org.junit.Test ;
 
 import com.hp.hpl.jena.query.ARQ ;
@@ -124,6 +125,7 @@ public class TestOptimizer extends BaseT
         check(queryString, opExpectedString) ;
     }
 
+    @Ignore //Ignore until JENA-587 is resolved
     @Test public void slice_order_to_topn_08()
     {
         assertTrue(ARQ.isTrueOrUndef(ARQ.optTopNSorting)) ;
@@ -182,6 +184,7 @@ public class TestOptimizer extends BaseT
         check(queryString, opExpectedString) ;
     }
 
+    @Ignore //Ignore until JENA-587 is resolved
     @Test public void distinct_to_reduced_01()
     {
         assertTrue(ARQ.isTrueOrUndef(ARQ.optDistinctToReduced)) ;
@@ -209,6 +212,7 @@ public class TestOptimizer extends BaseT
         }
     }
     
+    @Ignore //Ignore until JENA-587 is resolved
     @Test public void distinct_to_reduced_03()
     {
         assertTrue(ARQ.isTrueOrUndef(ARQ.optDistinctToReduced)) ;
@@ -252,6 +256,7 @@ public class TestOptimizer extends BaseT
         }
     }
     
+    @Ignore //Ignore until JENA-587 is resolved
     @Test public void distinct_order_by_application_03()
     {
         // Evaluation reordering optimization doesn't apply if it's a SELECT *
@@ -293,6 +298,7 @@ public class TestOptimizer extends BaseT
         check(queryString, opExpectedString) ;
     }
     
+    @Ignore //Ignore until JENA-587 is resolved
     @Test public void distinct_order_by_application_06()
     {
         // The optimization can apply when order conditions are not simple variables