Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Restore iter range pruning on comprehension ASTs #757

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Restore iter range pruning on comprehension ASTs #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4035d82
Restore iter range pruning on comprehension ASTs
TristonianJones Jun 23, 2023
99cc9a2
Additional tests for pruning comprehension ranges
TristonianJones Jun 26, 2023
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
21 changes: 21 additions & 0 deletions interpreter/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,27 @@ func (p *astPruner) prune(node *exprpb.Expr) (*exprpb.Expr, bool) {
},
}, true
}
case *exprpb.Expr_ComprehensionExpr:
compre := node.GetComprehensionExpr()
// Only the range of the comprehension is pruned since the state tracking only records
// the last iteration of the comprehension and not each step in the evaluation which
// means that the any residuals computed in between might be inaccurate.
if newRange, pruned := p.maybePrune(compre.GetIterRange()); pruned {
return &exprpb.Expr{
Id: node.GetId(),
ExprKind: &exprpb.Expr_ComprehensionExpr{
ComprehensionExpr: &exprpb.Expr_Comprehension{
IterVar: compre.GetIterVar(),
IterRange: newRange,
AccuVar: compre.GetAccuVar(),
AccuInit: compre.GetAccuInit(),
LoopCondition: compre.GetLoopCondition(),
LoopStep: compre.GetLoopStep(),
Result: compre.GetResult(),
},
},
}, true
}
}
return node, false
}
Expand Down
44 changes: 31 additions & 13 deletions interpreter/prune_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ import (
)

type testInfo struct {
in any
expr string
out string
in any
expr string
out string
iterRange string
}

var testCases = []testInfo{
Expand Down Expand Up @@ -370,25 +371,28 @@ var testCases = []testInfo{
in: partialActivation(map[string]any{
"users": []string{"alice", "bob"},
}, NewAttributePattern("r").QualString("attr").Wildcard()),
expr: `users.filter(u, u.startsWith(r.attr.prefix))`,
out: `["alice", "bob"].filter(u, u.startsWith(r.attr.prefix))`,
expr: `users.filter(u, u.startsWith(r.attr.prefix))`,
out: `["alice", "bob"].filter(u, u.startsWith(r.attr.prefix))`,
iterRange: `["alice", "bob"]`,
},
{
in: partialActivation(map[string]any{
"users": []string{"alice", "bob"},
}, NewAttributePattern("r").QualString("attr").Wildcard()),
expr: `users.filter(u, r.attr.prefix.endsWith(u))`,
out: `["alice", "bob"].filter(u, r.attr.prefix.endsWith(u))`,
expr: `users.filter(u, r.attr.prefix.endsWith(u))`,
out: `["alice", "bob"].filter(u, r.attr.prefix.endsWith(u))`,
iterRange: `["alice", "bob"]`,
},
{
in: unknownActivation("four"),
expr: `[1+3, 2+2, 3+1, four]`,
out: `[4, 4, 4, four]`,
},
{
in: unknownActivation("four"),
expr: `[1+3, 2+2, 3+1, four].exists(x, x == four)`,
out: `[4, 4, 4, four].exists(x, x == four)`,
in: unknownActivation("four"),
expr: `[1+3, 2+2, 3+1, four].exists(x, x == four)`,
out: `[4, 4, 4, four].exists(x, x == four)`,
iterRange: `[4, 4, 4, four]`,
},
{
in: unknownActivation("a", "c"),
Expand All @@ -406,8 +410,9 @@ var testCases = []testInfo{
in: partialActivation(map[string]any{
"a": map[string]any{},
}, "c"),
expr: `[has(a.b), has(c.d)].exists(x, x == true)`,
out: `[false, has(c.d)].exists(x, x == true)`,
expr: `[has(a.b), has(c.d)].exists(x, x == true)`,
out: `[false, has(c.d)].exists(x, x == true)`,
iterRange: `[false, has(c.d)]`,
},
{
in: partialActivation(map[string]any{
Expand Down Expand Up @@ -466,9 +471,22 @@ func TestPrune(t *testing.T) {
ExhaustiveEval(), Observe(EvalStateObserver(state)))
interpretable.Eval(testActivation(t, tst.in))
newExpr := PruneAst(ast.GetExpr(), ast.GetSourceInfo().GetMacroCalls(), state)
if tst.iterRange != "" {
compre := newExpr.GetExpr().GetComprehensionExpr()
if compre == nil {
t.Fatalf("iter range check cannot operate on non comprehension output: %v", newExpr.GetExpr())
}
gotIterRange, err := parser.Unparse(compre.GetIterRange(), newExpr.GetSourceInfo())
if err != nil {
t.Fatalf("parser.Unparse() failed: %v", err)
}
if gotIterRange != tst.iterRange {
t.Errorf("iter range unparse got: %v, wanted %v", gotIterRange, tst.iterRange)
}
}
actual, err := parser.Unparse(newExpr.GetExpr(), newExpr.GetSourceInfo())
if err != nil {
t.Error(err)
t.Fatalf("parser.Unparse() failed: %v", err)
}
if !test.Compare(actual, tst.out) {
for _, id := range state.IDs() {
Expand Down