Skip to content

Commit

Permalink
GH-2896: Inject values into (table unit)
Browse files Browse the repository at this point in the history
  • Loading branch information
afs committed Dec 18, 2024
1 parent b3f664c commit 3c71fdd
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.graph.Node ;
import org.apache.jena.riot.out.NodeFmtLib ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
Expand All @@ -34,25 +33,24 @@

/** A table of one row of one binding */
public class Table1 extends TableBase {
private Var var ;
private Node value ;
private final Binding row;

public Table1(Var var, Node value) {
this.var = var ;
this.value = value ;
this.row = BindingFactory.binding(var, value);
}

public Table1(Binding row) {
this.row = row;
}

@Override
public Iterator<Binding> rows() {
Binding b = BindingFactory.binding(var, value) ;
return Iter.singletonIterator(b) ;
return Iter.singletonIterator(row) ;
}

@Override
public QueryIterator iterator(ExecutionContext execCxt) {
// Root binding?
Binding binding = BindingFactory.binding(var, value) ;
QueryIterator qIter = QueryIterSingleton.create(null, var, value, execCxt) ;
QueryIterator qIter = QueryIterSingleton.create(row, execCxt) ;
return qIter ;
}

Expand All @@ -61,15 +59,15 @@ public void closeTable() {}

@Override
public List<Var> getVars() {
List<Var> x = new ArrayList<>() ;
x.add(var) ;
return x ;
List<Var> x = new ArrayList<>();
row.forEach((v,n)->x.add(v));
return x;
}

@Override
public List<String> getVarNames() {
List<String> x = new ArrayList<>() ;
x.add(var.getVarName()) ;
row.forEach((v,n)->x.add(v.getName()));
return x ;
}

Expand All @@ -85,6 +83,6 @@ public boolean isEmpty() {

@Override
public String toString() {
return "Table1(" + var + "," + NodeFmtLib.displayStr(value) + ")" ;
return "Table1(" + row + ")" ;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class Substitute {
*/
public static Op inject(Op opInput, Binding binding) {
Set<Var> injectVars = binding.varsMentioned();
Transform transform = new QueryIterLateral.TransformInject(injectVars, binding::get);
Transform transform = new QueryIterLateral.TransformInject(injectVars, binding, binding::get);
Op opOutput = Transformer.transform(transform, opInput);
return opOutput;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.jena.sparql.engine.iterator;

import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
Expand All @@ -27,8 +28,11 @@
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.algebra.Op;
import org.apache.jena.sparql.algebra.Table;
import org.apache.jena.sparql.algebra.TransformCopy;
import org.apache.jena.sparql.algebra.op.*;
import org.apache.jena.sparql.algebra.table.Table1;
import org.apache.jena.sparql.algebra.table.TableN;
import org.apache.jena.sparql.core.*;
import org.apache.jena.sparql.engine.ExecutionContext;
import org.apache.jena.sparql.engine.QueryIterator;
Expand Down Expand Up @@ -74,14 +78,14 @@ public static class TransformInject extends TransformCopy {
private final Set<Var> injectVars;
private final Set<Node> varsAsNodes;
private final Function<Var, Node> replacement;
private final Binding binding;
private static final boolean substitute = true;

// Replacement becomes binding.??
// Or "op call injection"!!
public TransformInject(Set<Var> injectVars, Function<Var, Node> replacement) {
public TransformInject(Set<Var> injectVars, Binding binding) {
this.injectVars = injectVars;
this.varsAsNodes = Set.copyOf(injectVars);
this.replacement = replacement;
this.replacement = binding::get;
this.binding = binding;
}

@Override
Expand Down Expand Up @@ -215,6 +219,7 @@ public Op transform(OpDatasetNames opDatasetNames) {
// Basic Graph Pattern Matching
// Property Path Patterns
// evaluation of algebra form Graph(var,P) involving a variable (from the syntax GRAPH ?variable {&hellip;})
// and also nested (table unit) inside (extend)

@Override
public Op transform(OpPath opPath) {
Expand Down Expand Up @@ -270,6 +275,36 @@ public Op transform(OpTriple opTriple) {
return opExec;
}

private OpTable tableUnitTransformed = null;

@Override
public Op transform(OpTable opTable) {
// Unit table.
if ( opTable.isJoinIdentity() ) {
if ( tableUnitTransformed == null ) {
Table table2 = new Table1(binding);
// Multiple assignment does not matter!
tableUnitTransformed = OpTable.create(table2);
}
return tableUnitTransformed;
}

// By the assignment restriction, the binding only needs to be added to each row of the table.
Table table = opTable.getTable();
// Table vars.
List<Var> vars = new ArrayList<>(table.getVars());
binding.vars().forEachRemaining(vars::add);
TableN table2 = new TableN(vars);
BindingBuilder builder = BindingFactory.builder();
table.iterator(null).forEachRemaining(row->{
builder.reset();
builder.addAll(row);
builder.addAll(binding);
table2.addBinding(builder.build());
});
return OpTable.create(table2);
}

private Triple applyReplacement(Triple triple, Function<Var, Node> replacement) {
Node s2 = applyReplacement(triple.getSubject(), replacement);
Node p2 = applyReplacement(triple.getPredicate(), replacement);
Expand Down

0 comments on commit 3c71fdd

Please sign in to comment.