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/07/12 13:06:56 UTC
[1/5] jena git commit: Fixup merge conflicit
Repository: jena
Updated Branches:
refs/heads/master 6ba5efdc0 -> 5d22a0c90
Fixup merge conflicit
Rename "tracker" in AssignmentPusher to avoid fiele hiding.
Fix "unused" warnings to eb consistent with the geenral codebase,
that is, don't annotate unused private methods.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/da98f8a6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/da98f8a6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/da98f8a6
Branch: refs/heads/master
Commit: da98f8a6222f5582f4f42199d1f5c57c366ccdff
Parents: 3eb0cd5
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 12 12:04:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 12 12:04:24 2015 +0100
----------------------------------------------------------------------
.../optimize/TransformEliminateAssignments.java | 57 +++++---------------
1 file changed, 13 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/da98f8a6/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
index 818434b..2adb98f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
@@ -18,42 +18,16 @@
package org.apache.jena.sparql.algebra.optimize;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.CollectionUtils;
-
-import org.apache.jena.query.SortCondition;
-import org.apache.jena.sparql.algebra.Op;
-import org.apache.jena.sparql.algebra.OpVisitor;
-import org.apache.jena.sparql.algebra.OpVisitorBase;
-import org.apache.jena.sparql.algebra.Transform;
-import org.apache.jena.sparql.algebra.TransformCopy;
-import org.apache.jena.sparql.algebra.Transformer;
-import org.apache.jena.sparql.algebra.op.OpExt;
-import org.apache.jena.sparql.algebra.op.OpExtend;
-import org.apache.jena.sparql.algebra.op.OpFilter;
-import org.apache.jena.sparql.algebra.op.OpGroup;
-import org.apache.jena.sparql.algebra.op.OpOrder;
-import org.apache.jena.sparql.algebra.op.OpProject;
-import org.apache.jena.sparql.algebra.op.OpTopN;
-import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.core.VarExprList;
-import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.expr.ExprAggregator;
-import org.apache.jena.sparql.expr.ExprLib;
-import org.apache.jena.sparql.expr.ExprList;
-import org.apache.jena.sparql.expr.ExprTransform;
-import org.apache.jena.sparql.expr.ExprTransformSubstitute;
-import org.apache.jena.sparql.expr.ExprTransformer;
-import org.apache.jena.sparql.expr.ExprVars;
-import org.apache.jena.sparql.expr.NodeValue;
+import java.util.* ;
+
+import org.apache.jena.atlas.lib.CollectionUtils ;
+import org.apache.jena.query.SortCondition ;
+import org.apache.jena.sparql.ARQInternalErrorException ;
+import org.apache.jena.sparql.algebra.* ;
+import org.apache.jena.sparql.algebra.op.* ;
+import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.sparql.core.VarExprList ;
+import org.apache.jena.sparql.expr.* ;
/**
* A transform that tries to in-line/eliminate assignments
@@ -448,7 +422,6 @@ public class TransformEliminateAssignments extends TransformCopy {
return Transformer.transform(new TransformRemoveAssignment(var, getAssignExpr(var)), subOp);
}
- @SuppressWarnings("unused")
private VarExprList processVarExprList(VarExprList exprs, ExprTransform transform) {
VarExprList newExprs = new VarExprList();
for (Var v : exprs.getVars()) {
@@ -459,7 +432,6 @@ public class TransformEliminateAssignments extends TransformCopy {
return newExprs;
}
- @SuppressWarnings("unused")
private List<ExprAggregator> processAggregators(List<ExprAggregator> aggs, ExprTransform transform) {
List<ExprAggregator> newAggs = new ArrayList<ExprAggregator>();
for (ExprAggregator agg : aggs) {
@@ -526,17 +498,17 @@ public class TransformEliminateAssignments extends TransformCopy {
private static class AssignmentPusher extends VariableUsagePusher {
- private AssignmentTracker tracker;
+ private AssignmentTracker assignmentTracker;
public AssignmentPusher(AssignmentTracker tracker) {
super(tracker);
- this.tracker = tracker;
+ this.assignmentTracker = tracker;
}
@Override
public void visit(OpProject opProject) {
super.visit(opProject);
- this.tracker.incrementDepth();
+ this.assignmentTracker.incrementDepth();
}
}
@@ -562,8 +534,6 @@ public class TransformEliminateAssignments extends TransformCopy {
this.tracker.decrementDepth();
}
-<<<<<<< HEAD:jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
-=======
@Override
public void visit(OpUnion opUnion) {
unsafe();
@@ -607,7 +577,6 @@ public class TransformEliminateAssignments extends TransformCopy {
// inlining could change the semantics
tracker.getAssignments().clear();
}
->>>>>>> 67bb248... Additional tests and fixes for assignment inlining (JENA-780):jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformEliminateAssignments.java
}
/**
[3/5] jena git commit: Expand comment.
Posted by an...@apache.org.
Expand comment.
Remove autogenerated constructor comment.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/23d6d02d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/23d6d02d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/23d6d02d
Branch: refs/heads/master
Commit: 23d6d02dc297496fb12ef9af31f9374f34916d8e
Parents: a55a874
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 12 12:05:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 12 12:05:24 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/sparql/expr/ExprVars.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/23d6d02d/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
index 64541e4..d173682 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
@@ -143,11 +143,12 @@ public class ExprVars
{
public ExprNoOpVarsWorker(Collection<T> acc, Action<T> action) {
super(acc, action);
- // TODO Auto-generated constructor stub
}
+ @Override
public void visit(ExprFunctionOp funcOp) {
- // Don't include op vars
+ // As for ExprVarsWorker except don't include the vars in the
+ // the algebra exprssion of an ExprFunctionOp
return;
}
}
[4/5] jena git commit: Remove unnecessary semi-colon.
Posted by an...@apache.org.
Remove unnecessary semi-colon.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/53f1430b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/53f1430b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/53f1430b
Branch: refs/heads/master
Commit: 53f1430bd93f5391934c4afdf60ea14d1cb57926
Parents: 23d6d02
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 12 12:05:40 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 12 12:05:40 2015 +0100
----------------------------------------------------------------------
.../sparql/algebra/optimize/TestTransformEliminateAssignments.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/53f1430b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformEliminateAssignments.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformEliminateAssignments.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformEliminateAssignments.java
index 4c6c7f2..5490085 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformEliminateAssignments.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestTransformEliminateAssignments.java
@@ -388,7 +388,7 @@ public class TestTransformEliminateAssignments {
testNoChange("(project (?x ?y)",
" (filter (exprlist ?x)",
" (extend (?x true)",
- " (bgp (triple ?y <urn:pred> <urn:obj>)))))");;
+ " (bgp (triple ?y <urn:pred> <urn:obj>)))))");
//@formatter:on
}
[2/5] jena git commit: Remove blank line
Posted by an...@apache.org.
Remove blank line
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a55a8746
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a55a8746
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a55a8746
Branch: refs/heads/master
Commit: a55a8746bde6ea172cc7bbb890b08dfb48a50cb1
Parents: da98f8a
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 12 12:04:43 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 12 12:04:43 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/algebra/optimize/TransformRemoveAssignment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a55a8746/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java
index 503a13c..aa63aca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java
@@ -121,9 +121,9 @@ public class TransformRemoveAssignment extends TransformCopy {
return subOp;
}
}
-
}
+ @Override
public Op transform(OpProject opProject, Op subOp) {
if (!opProject.getVars().contains(this.var))
return super.transform(opProject, subOp);
[5/5] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5d22a0c9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5d22a0c9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5d22a0c9
Branch: refs/heads/master
Commit: 5d22a0c9009d426461f406835db026779c25851b
Parents: 53f1430 6ba5efd
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 12 12:05:58 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 12 12:05:58 2015 +0100
----------------------------------------------------------------------
jena-core/pom.xml | 8 +-------
jena-parent/pom.xml | 14 +-------------
2 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------