fix(osvmatcher): dedupe bulk queries#2808
Open
rohan-patnaik wants to merge 2 commits into
Open
Conversation
This file contains hidden or 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
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.
Overview
This fixes duplicate package queries being sent in the same OSV bulk request.
Fixes #2654
Details
When the scan input contains the same package more than once,
OSVMatchercurrently sends that same package/version query multiple times to OSV. That does not change the final result, but it does add unnecessary API work and makes larger scans do more work than needed.This PR deduplicates equivalent OSV queries before calling
BatchQueryPaging, then expands the hydrated results back to the original package order. That keeps the scanner output behavior the same while reducing duplicate requests.I also updated the cached matcher query collection to use the same query key, so it does not rely on pointer identity when collecting missing package queries.
Testing
go test ./internal/clients/clientimpl/osvmatcher.go test ./internal/clients/clientimpl/....Checklist
./scripts/run_lints.sh.go test ./internal/clients/clientimpl/....