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 2011/11/05 13:01:10 UTC

svn commit: r1197939 - in /incubator/jena/Jena2/ARQ/trunk/src: main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java

Author: andy
Date: Sat Nov  5 12:01:10 2011
New Revision: 1197939

URL: http://svn.apache.org/viewvc?rev=1197939&view=rev
Log:
JENA-154

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java?rev=1197939&r1=1197938&r2=1197939&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java Sat Nov  5 12:01:10 2011
@@ -37,8 +37,8 @@ public class AlgebraQuad extends Transfo
     //   + Drop (previous) OpGraph 
     //   + Paths (complex - simple ones are flatten elsewhere) go to (graph (path ...)) [later: quad paths] 
 
-    // Done as a before/after pair to run the stack of graph
-    // nodes and a transform to do the conversion. 
+    // Done as a before/after pair to run the stack of graph nodes for rewrite.
+    // Need to be careful of use of a variable in GRAPH ?g { .. } and then use ?g inside the pattern.
     
     private AlgebraQuad() { }
 

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java?rev=1197939&r1=1197938&r2=1197939&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TS_Algebra.java Sat Nov  5 12:01:10 2011
@@ -35,7 +35,8 @@ import org.junit.runners.Suite ;
     , TestVarRename.class
     , TestOptimizer.class
     , TestPattern2Join.class
-    , TestTransformQuads.class
+    , TestTransformQuads.class
+    
 //    , TestUnionGraph.class
 //    , TestUnionTransformTriples.class
 //    , TestUnionTransformQuads.class

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java?rev=1197939&r1=1197938&r2=1197939&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java Sat Nov  5 12:01:10 2011
@@ -29,19 +29,6 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
 //Tests for conversion of algebra forms to quad form. 
 public class TestTransformQuads extends BaseTest
 {
-    /*
-     *  
-"(sequence   (quadpattern (quad ?g ?s ?p ?o))   (quadpattern (quad ?g1 ?s1 ?p1 ?o1)))"
-"(sequence   (quadpattern (quad ?g ?s ?p ?o))   (quadpattern (quad ?g ?s1 ?p1 ?o1)))"
-"(sequence   (quadpattern (quad ?g ?s ?p ?o))   (quadpattern (quad ?g1 ?s1 ?p1 ?o1)))"
-"(assign ((?g ?*g0))   (sequence     (quadpattern (quad ?*g0 ?s ?p ?o))     (quadpattern (quad ?g ?s1 ?p1 ?o1))))" 
-"(assign ((?g ?*g0))   (filter (= (str ?g) "graphURI")     (quadpattern (quad ?*g0 ?s ?p ?o))))" 
-"(filter (= (str ?g) "graphURI")   (quadpattern (quad ?g ?s ?p ?o)))"
-"(assign ((?g ?*g0))   (sequence     (quadpattern (quad ?*g0 ?s ?p ?o))     (filter (= (str ?g) "graphURI")       (quadpattern (quad ?g1 ?s1 ?p1 ?o1)))))"
-"(sequence   (quadpattern (quad ?g ?s ?p ?o))   (assign ((?g1 ?*g0))     (filter (= (str ?g1) "graphURI")       (quadpattern (quad ?*g0 ?s1 ?p1 ?o1)))))"
-"(sequence   (assign ((?g ?*g0))     (filter (= (str ?g) "graphURI")       (quadpattern (quad ?*g0 ?s ?p ?o))))   (assign ((?g ?*g1))     (filter (= (str ?g) "graphURI")       (quadpattern (quad ?*g1 ?s ?p ?o)))))" 
-
-     */
     // Simple
     @Test public void quads01() { test ("{ GRAPH ?g { ?s ?p ?o } }", 
                                         "(quadpattern (quad ?g ?s ?p ?o))"