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 2015/02/07 13:37:56 UTC

[1/2] jena git commit: JENA-881 : Don't leak filter expressions into the unplaced list.

Repository: jena
Updated Branches:
  refs/heads/master 387bc73e5 -> 491d0f964


JENA-881 : Don't leak filter expressions into the unplaced list.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4f5fd491
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4f5fd491
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4f5fd491

Branch: refs/heads/master
Commit: 4f5fd491949127be1d4584df8444d1c4ac8772b5
Parents: 387bc73
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 7 12:37:02 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 7 12:37:02 2015 +0000

----------------------------------------------------------------------
 .../optimize/TransformFilterPlacement.java      | 34 +++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4f5fd491/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
index 023b03c..435d787 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
@@ -210,7 +210,6 @@ public class TransformFilterPlacement extends TransformCopy {
             placement = placeAssign(exprs, (OpAssign)input) ;
         // Modifiers
 //        else if ( input instanceof OpGroup ) {
-//            // TODO
 //            placement = noChangePlacement ;
 //        }
 //        else if ( input instanceof OpSlice ) {
@@ -233,16 +232,29 @@ public class TransformFilterPlacement extends TransformCopy {
     }
     
     private Placement placeFilter(ExprList exprs, OpFilter input) {
-        if ( exprs.size() == 0 )
-            // Unpack the filter,
-            return transform(input.getExprs(), input.getSubOp()) ;
-        
-        // Thrown the filter expressions into the general list to be placed.
-        // Add to keep the application order (original filter then additional exprs)
-        // Not important, but nice.
-        ExprList exprs2 = ExprList.copy(input.getExprs()) ;
-        exprs2.addAll(exprs);
-        return transform(exprs2, input.getSubOp()) ;
+        // If input.getSubOp is itself a filter, it has already been
+        // processed because the Transform is applied bottom-up.
+
+        // We must not let the filter's expressions go back as "unplaced"
+        // as they are scoped to the input and if "unplaced" are available
+        // out of that scope.
+
+        Op op = input.getSubOp() ;
+        ExprList exprsInner = input.getExprs() ;
+        ExprList exprsOuter = exprs ;
+
+        // Outer
+        Placement p = transform(exprsOuter, input.getSubOp()) ;
+        if ( p != null ) {
+            op = p.op ;
+            exprsOuter = p.unplaced ;
+        }
+        // Put inner round the modified Op.
+        // If op is also a filter, a single filter is created with
+        // exprsInner now after placed filters.
+        // ("after" means later in the exprList of the filter).
+        Op f = OpFilter.filter(exprsInner, op) ;
+        return new Placement(f, exprsOuter) ;
     }
 
     private Placement placeOrWrapBGP(ExprList exprs, OpBGP x) {


[2/2] jena git commit: JENA-881: Change test results - order in exprlists has changed.

Posted by an...@apache.org.
JENA-881: Change test results - order in exprlists has changed.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/491d0f96
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/491d0f96
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/491d0f96

Branch: refs/heads/master
Commit: 491d0f9647ab215434c74e7145859d02542deeec
Parents: 4f5fd49
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Feb 7 12:37:34 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Feb 7 12:37:34 2015 +0000

----------------------------------------------------------------------
 .../optimize/TestTransformFilterPlacement.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/491d0f96/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
index f1b26eb..45cb1e1 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformFilterPlacement.java
@@ -377,7 +377,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
 
     @Test public void place_extend_04() {
         test("(filter (= ?x 123) (extend ((?x1 123)) (filter (< ?x 456) (bgp (?s ?p ?x) (?s ?p ?z))) ))",
-             "(extend (?x1 123) (sequence (filter ((< ?x 456) (= ?x 123)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
+             "(extend (?x1 123) (sequence (filter ((= ?x 123) (< ?x 456)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
     }
 
     @Test public void place_extend_05() {
@@ -466,7 +466,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
     @Test public void place_assign_04() {
         // Caution - OpFilter equality is sensitive to the order of expressions 
         test("(filter (= ?x 123) (assign ((?x1 123)) (filter (< ?x 456) (bgp (?s ?p ?x) (?s ?p ?z))) ))",
-             "(assign (?x1 123) (sequence (filter ((< ?x 456) (= ?x 123)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
+             "(assign (?x1 123) (sequence (filter ((= ?x 123) (< ?x 456)) (bgp (?s ?p ?x))) (bgp (?s ?p ?z))) )") ;
     }
     
     @Test public void place_assign_05() {
@@ -571,7 +571,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
              ,"  (sequence"
              ,"    (filter 1 (table unit))"
              , "   (bgp (triple ?s ?p ?o)))"
-             ,"  (filter (exprlist 0 1) (table unit))"
+             ,"  (filter (exprlist 1 0) (table unit))"
              ,")"
              );
         test(in, out) ;
@@ -588,7 +588,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
         String out = StrUtils.strjoinNL
             ("(union"
             ,"  (filter 1 (bgp (triple ?s ?p ?o)))"
-            ,"  (filter (exprlist 0 1) (table unit))"
+            ,"  (filter (exprlist 1 0) (table unit))"
             ,")"
             );
         testNoBGP(in, out) ;
@@ -612,7 +612,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
              ,"      (sequence"
              ,"         (filter 1 (table unit))"
              ,"         (bgp (?s ?p ?o)))"
-             ,"      (filter (exprlist 0 1)"
+             ,"      (filter (exprlist 1 0)"
              ,"        (table unit))"
              ,     ")"
              ,"))");
@@ -635,7 +635,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
             ,"  (project (?s ?p ?o)"
             ,"    (union"
             ,"      (filter 1 (bgp (?s ?p ?o)))"
-            ,"      (filter (exprlist 0 1) (table unit))"
+            ,"      (filter (exprlist 1 0) (table unit))"
             ,     ")"
             ,"))");
         testNoBGP(in, out) ;
@@ -656,7 +656,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
            ,"    (filter (= 1 1)"
            ,"      (table unit))"
            ,"    (bgp (triple ?s ?p ?o)))"
-           ,"  (filter (exprlist (!= 0 0) (= 1 1))"
+           ,"  (filter (exprlist (= 1 1) (!= 0 0))"
            ,"   (table unit)))"
               ) ;
         test ( in, out ) ;
@@ -674,7 +674,7 @@ public class TestTransformFilterPlacement extends BaseTest { //extends AbstractT
             ("(union"
             ,"   (filter (= 1 1)"
             ,"     (bgp (triple ?s ?p ?o)))"
-            ,"   (filter (exprlist (!= 0 0) (= 1 1))"
+            ,"   (filter (exprlist (= 1 1) (!= 0 0))"
             ,"     (table unit)))"
             ) ;
         testNoBGP ( in, out ) ;