Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-4915 Fixed setting parent in ValueExprTripleRef#replaceChildNode #4916

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,9 @@ public class ValueExprTripleRef extends AbstractQueryModelNode implements ValueE

public ValueExprTripleRef(String extName, Var s, Var p, Var o) {
this.exprVarName = extName;
subjectVar = s;
predicateVar = p;
objectVar = o;

subjectVar.setParentNode(this);
predicateVar.setParentNode(this);
objectVar.setParentNode(this);
setSubjectVar(s);
setPredicateVar(p);
setObjectVar(o);
}

public String getExtVarName() {
Expand All @@ -45,6 +41,21 @@ public Var getObjectVar() {
return objectVar;
}

private void setSubjectVar(Var s) {
subjectVar = s;
subjectVar.setParentNode(this);
}

private void setPredicateVar(Var p) {
predicateVar = p;
predicateVar.setParentNode(this);
}

private void setObjectVar(Var o) {
objectVar = o;
objectVar.setParentNode(this);
}

@Override
public <X extends Exception> void visitChildren(QueryModelVisitor<X> visitor) throws X {
if (subjectVar != null) {
Expand Down Expand Up @@ -84,17 +95,16 @@ public ValueExprTripleRef clone() {
@Override
public <X extends Exception> void visit(QueryModelVisitor<X> visitor) throws X {
visitor.meetOther(this);
// visitChildren(visitor);
}

@Override
public void replaceChildNode(QueryModelNode current, QueryModelNode replacement) {
if (subjectVar == current) {
subjectVar = (Var) replacement;
setSubjectVar((Var) replacement);
} else if (predicateVar == current) {
predicateVar = (Var) replacement;
setPredicateVar((Var) replacement);
} else if (objectVar == current) {
objectVar = (Var) replacement;
setObjectVar((Var) replacement);
} else {
super.replaceChildNode(current, replacement);
}
Expand Down
Loading