Fix/virtual-cache ref unification scope #6957
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…val ref unification Fixes: open-policy-agent#6926 Signed-off-by: Johan Fylling <johan.dev@fylling.se>
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
✅ Deploy Preview for openpolicyagent ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
srenatus
previously approved these changes
Aug 26, 2024
topdown/eval.go
Outdated
| return 1 | ||
| } | ||
|
|
||
| func (q vcKeyScope) Find(_ ast.Ref) (ast.Value, error) { |
There was a problem hiding this comment.
nit
Suggested change
| func (q vcKeyScope) Find(_ ast.Ref) (ast.Value, error) { | |
| func (vcKeyScope) Find(ast.Ref) (ast.Value, error) { |
| @@ -2861,6 +2898,82 @@ func (e evalVirtualPartial) evalCache(iter unifyIterator) (evalVirtualPartialCac | |||
| return hint, nil | |||
| } | |||
|
|
|||
| // vcKeyScope represents the scoping that pre-rule-eval ref unification imposes on a virtual cache entry. | |||
| type vcKeyScope struct { | |||
| ast.Ref | |||
There was a problem hiding this comment.
Would we safe memory if we kept the index next to the ast.Ref?
type vcKeyScope struct {
ref ast.Ref
idx int
}so that we can avoid copying the ast.Ref? I guess it doesn't make a huge difference 🤔
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
srenatus
reviewed
Aug 26, 2024
* Only skipping key scope element comparison if both elements are vars Signed-off-by: Johan Fylling <johan.dev@fylling.se>
Comment on lines
+2859
to
2876
| if plugged.IsGround() && !scoping { | ||
| hintKeyEnd = i | ||
| hint.key = append(e.plugged[:i], plugged) | ||
| } else { | ||
| scoping = true | ||
| hl := len(hint.key) | ||
| if hl == 0 { | ||
| break | ||
| } | ||
| if scope, ok := hint.key[hl-1].Value.(vcKeyScope); ok { | ||
| scope.Ref = append(scope.Ref, plugged) | ||
| hint.key[len(hint.key)-1] = ast.NewTerm(scope) | ||
| } else { | ||
| scope = vcKeyScope{} | ||
| scope.Ref = append(scope.Ref, plugged) | ||
| hint.key = append(hint.key, ast.NewTerm(scope)) | ||
| } | ||
| } |
There was a problem hiding this comment.
It would be helpful if we were to add a comment here explaining the code in the loop with an example if feasible. It would probably help a future reviewer.
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
ashutosh-narkar
approved these changes
Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
topdown: Adding scope component to virtual cache key to capture pre-eval ref unification
Fixes: #6926