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 2014/09/18 11:27:41 UTC
svn commit: r1625924 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
Author: andy
Date: Thu Sep 18 09:27:41 2014
New Revision: 1625924
URL: http://svn.apache.org/r1625924
Log:
Remove commented code used for investigation only.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java?rev=1625924&r1=1625923&r2=1625924&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java Thu Sep 18 09:27:41 2014
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+z * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -18,7 +18,10 @@
package com.hp.hpl.jena.sparql.algebra.optimize ;
-import java.util.* ;
+import java.util.Collection ;
+import java.util.Iterator ;
+import java.util.List ;
+import java.util.Set ;
import org.apache.jena.atlas.lib.CollectionUtils ;
import org.apache.jena.atlas.lib.DS ;
@@ -602,47 +605,14 @@ public class TransformFilterPlacement ex
private Placement processExtendAssign(ExprList exprs, OpExtendAssign input) {
// We assume that each (extend) and (assign) is in simple form - always one
- // assignment. We cope with more but do not attempt reordering of assignments.
+ // assignment. We cope with the general form (multiple assignments)
+ // but do not attempt reordering of assignments.
List<Var> vars1 = input.getVarExprList().getVars() ;
ExprList pushed = new ExprList() ;
ExprList unpushed = new ExprList() ;
Op subOp = input.getSubOp() ;
Set<Var> subVars = OpVars.fixedVars(subOp) ;
-// // ----
-// // Backwards.
-// for ( int i = vars1.size()-1; i >= 0 i-- ) {
-// Var v =
-// }
-//
-// Set<Var> assignmentVars = new HashSet<>() ;
-// ExprList pushed2 = new ExprList() ;
-// ExprList unpushed2 = new ExprList() ;
-// for ( Var v : vars1 ) {
-// assignmentVars.add(v) ;
-// Expr e = input.getVarExprList().getExpr(v) ;
-// for ( Expr expr : exprs ) {
-// Set<Var> exprVars = expr.getVarsMentioned() ;
-// if ( disjoint(vars1, exprVars) && subVars.containsAll(exprVars) )
-// System.out.ptinln(
-// else
-// unpushed2.add(expr) ;
-// }
-//
-//
-//
-// if ( ! assignmentVars.contains(v) && subVars.containsAll(exprVars) ) {
-//
-// }
-//
-//
-// }
-
-
-
- // ----
-
-
for ( Expr expr : exprs ) {
Set<Var> exprVars = expr.getVarsMentioned() ;
if ( disjoint(vars1, exprVars) && subVars.containsAll(exprVars) )