This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit c0570fc5576c34c05669a0f44526aba7da08ff78 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Aug 16 14:52:34 2024 +0100 Update white space --- .../sparql/engine/iterator/QueryIterProject.java | 74 +++++++++++---------- .../engine/iterator/QueryIterProjectMerge.java | 75 +++++++++++----------- .../apache/jena/sparql/engine/main/OpExecutor.java | 2 +- .../jena/sparql/engine/ref/EvaluatorSimple.java | 2 +- 4 files changed, 76 insertions(+), 77 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java index 48713bab54..0b26843c40 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java @@ -18,58 +18,56 @@ package org.apache.jena.sparql.engine.iterator; -import java.util.List ; +import java.util.List; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.atlas.lib.Lib ; -import org.apache.jena.atlas.lib.ListUtils ; -import org.apache.jena.sparql.core.Var ; -import org.apache.jena.sparql.engine.ExecutionContext ; -import org.apache.jena.sparql.engine.QueryIterator ; -import org.apache.jena.sparql.engine.binding.Binding ; -import org.apache.jena.sparql.engine.binding.BindingProject ; -import org.apache.jena.sparql.serializer.SerializationContext ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.atlas.lib.Lib; +import org.apache.jena.atlas.lib.ListUtils; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.engine.QueryIterator; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.engine.binding.BindingProject; +import org.apache.jena.sparql.serializer.SerializationContext; +public class QueryIterProject extends QueryIterConvert { -public class QueryIterProject extends QueryIterConvert -{ - List<Var> projectionVars ; + public static QueryIterator create(QueryIterator input, List<Var> vars, ExecutionContext qCxt) { + return new QueryIterProject(input, vars, qCxt); + } + + private List<Var> projectionVars; - public QueryIterProject(QueryIterator input, List<Var> vars, ExecutionContext qCxt) - { - super(input, project(vars, qCxt), qCxt) ; - projectionVars = vars ; + private QueryIterProject(QueryIterator input, List<Var> vars, ExecutionContext qCxt) { + super(input, project(vars, qCxt), qCxt); + projectionVars = vars; } - static QueryIterConvert.Converter project(List<Var> vars, ExecutionContext qCxt) - { - return new Projection(vars, qCxt) ; + static QueryIterConvert.Converter project(List<Var> vars, ExecutionContext qCxt) { + return new Projection(vars, qCxt); + } + + public List<Var> getProjectionVars() { + return projectionVars; } - - public List<Var> getProjectionVars() { return projectionVars ; } @Override - protected void details(IndentedWriter out, SerializationContext sCxt) - { - out.print(Lib.className(this)) ; - out.print(" ") ; - ListUtils.print(out, projectionVars) ; + protected void details(IndentedWriter out, SerializationContext sCxt) { + out.print(Lib.className(this)); + out.print(" "); + ListUtils.print(out, projectionVars); } - - static - class Projection implements QueryIterConvert.Converter - { - List<Var> projectionVars ; - Projection(List<Var> vars, ExecutionContext qCxt) - { - this.projectionVars = vars ; + static class Projection implements QueryIterConvert.Converter { + List<Var> projectionVars; + + Projection(List<Var> vars, ExecutionContext qCxt) { + this.projectionVars = vars; } @Override - public Binding convert(Binding bind) - { - return new BindingProject(projectionVars, bind) ; + public Binding convert(Binding bind) { + return new BindingProject(projectionVars, bind); } } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProjectMerge.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProjectMerge.java index 754f0fd2fd..2630ef8b15 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProjectMerge.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProjectMerge.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.jena.sparql.engine.iterator ; +package org.apache.jena.sparql.engine.iterator; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; -import org.apache.jena.atlas.logging.Log ; -import org.apache.jena.graph.Node ; -import org.apache.jena.sparql.algebra.op.OpProject ; -import org.apache.jena.sparql.core.Var ; -import org.apache.jena.sparql.engine.ExecutionContext ; -import org.apache.jena.sparql.engine.QueryIterator ; -import org.apache.jena.sparql.engine.binding.* ; -import org.apache.jena.sparql.engine.main.OpExecutor ; +import org.apache.jena.atlas.logging.Log; +import org.apache.jena.graph.Node; +import org.apache.jena.sparql.algebra.op.OpProject; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.engine.QueryIterator; +import org.apache.jena.sparql.engine.binding.*; +import org.apache.jena.sparql.engine.main.OpExecutor; /** * Execute a projection in the middle of an execution. This requires the outcome @@ -37,68 +37,69 @@ import org.apache.jena.sparql.engine.main.OpExecutor ; * should not be used. */ public class QueryIterProjectMerge extends QueryIterRepeatApply { - private final OpProject opProject ; - private final OpExecutor engine ; + private final OpProject opProject; + private final OpExecutor engine; public QueryIterProjectMerge(OpProject opProject, QueryIterator input, OpExecutor engine, ExecutionContext execCxt) { - super(input, execCxt) ; - this.opProject = opProject ; - this.engine = engine ; + super(input, execCxt); + this.opProject = opProject; + this.engine = engine; } @Override protected QueryIterator nextStage(Binding binding) { QueryIterator qIter = engine.executeOp(opProject.getSubOp(), - QueryIterSingleton.create(binding, getExecContext())) ; + QueryIterSingleton.create(binding, getExecContext())); qIter = new QueryIterConvert(qIter, new ProjectEnsureBindingConverter(binding, opProject.getVars()), - getExecContext()) ; - return qIter ; + getExecContext()); + return qIter; } /** Ensure binding from outer binding are present when projecting */ static class ProjectEnsureBindingConverter implements QueryIterConvert.Converter { - private final Binding outerBinding ; - private final List<Var> projectionVars ; + private final Binding outerBinding; + private final List<Var> projectionVars; public ProjectEnsureBindingConverter(Binding outerBinding, List<Var> vars) { - this.outerBinding = outerBinding ; - this.projectionVars = vars ; + this.outerBinding = outerBinding; + this.projectionVars = vars; } @Override public Binding convert(Binding bind) { - return ensure(projectionVars, outerBinding, bind) ; + return ensure(projectionVars, outerBinding, bind); // Effectively, this is: - //bind = new BindingProject(projectionVars, bind) ; - // return BindingUtils.merge(outerBinding, bind) ; + //bind = new BindingProject(projectionVars, bind); + // return BindingUtils.merge(outerBinding, bind); } - /** Merge two bindings, the outer and inner, projecting the inner with the give variables. - * This is what happens in substitutIon execution, with a inner select-project. + /** + * Merge two bindings, the outer and inner, projecting the inner with the given variables. + * This is what happens in substitution execution, with an inner select-project. */ private static Binding ensure(List<Var> vars, Binding outer, Binding inner) { // A specialised BindingUtils.merge that does project as well. // Reduce small object churn. - BindingBuilder b2 = Binding.builder(outer) ; - Iterator<Var> vIter = (vars != null) ? vars.iterator() : inner.vars() ; + BindingBuilder b2 = Binding.builder(outer); + Iterator<Var> vIter = (vars != null) ? vars.iterator() : inner.vars(); // Add any variables from the RHS - for ( ; vIter.hasNext() ; ) { - Var v = vIter.next() ; - Node n2 = inner.get(v) ; + for (; vIter.hasNext(); ) { + Var v = vIter.next(); + Node n2 = inner.get(v); if ( n2 == null ) - continue ; + continue; if ( ! b2.contains(v) ) - b2.add(v, inner.get(v)) ; + b2.add(v, inner.get(v)); else { // Checking! - Node n1 = outer.get(v) ; + Node n1 = outer.get(v); if ( ! n1.equals(n2) ) Log.warn(ProjectEnsureBindingConverter.class, "merge: Mismatch : "+n1+" != "+n2); } } - return b2.build() ; + return b2.build(); } } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java index 93b12bfed6..0edb6b263d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java @@ -391,7 +391,7 @@ public class OpExecutor { if ( input instanceof QueryIterRoot ) { QueryIterator qIter = exec(opProject.getSubOp(), input); - qIter = new QueryIterProject(qIter, opProject.getVars(), execCxt); + qIter = QueryIterProject.create(qIter, opProject.getVars(), execCxt); return qIter; } // Nested projected : need to ensure the input is seen. diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java index c37b84a7cf..749402c18b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java @@ -210,7 +210,7 @@ public class EvaluatorSimple implements Evaluator { @Override public Table project(Table table, List<Var> projectVars) { QueryIterator qIter = table.iterator(getExecContext()); - qIter = new QueryIterProject(qIter, projectVars, getExecContext()); + qIter = QueryIterProject.create(qIter, projectVars, getExecContext()); return new TableN(qIter); }
