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

fix: inconsistent removal of binaries by file overlap #2036

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

kzantow
Copy link
Contributor

@kzantow kzantow commented Aug 17, 2023

This PR corrects an issue where binary packages removed by ownership-by-file-overlap relationships were inconsistently removing entries.

Fixes: #2035

Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow kzantow changed the title fix: inconsistent removal of binaries by overlap fix: inconsistent removal of binaries by file overlap Aug 17, 2023
@github-actions
Copy link

Benchmark Test Results

Benchmark results from the latest changes vs base branch
goos: linux%0Agoarch: amd64%0Apkg: github.com/anchore/syft/test/integration%0Acpu: Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz%0A                                                              │ ./.tmp/benchmark-941356a.txt │%0A                                                              │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        13.11m ± 2%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         768.6µ ± 3%25%0AImagePackageCatalogers/binary-cataloger-2                                        213.5µ ± 4%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        671.2µ ± 2%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                    23.88µ ± 3%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                              101.7µ ± 7%25%0AImagePackageCatalogers/java-cataloger-2                                          14.28m ± 2%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                          99.78µ ± 2%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            415.1µ ± 3%25%0AImagePackageCatalogers/nix-store-cataloger-2                                     295.8µ ± 3%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        834.6µ ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                       507.3µ ± 2%25%0AImagePackageCatalogers/python-package-cataloger-2                                3.495m ± 1%25%0AImagePackageCatalogers/r-package-cataloger-2                                     220.5µ ± 1%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        590.5µ ± 3%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  956.2µ ± 1%25%0AImagePackageCatalogers/sbom-cataloger-2                                          121.4µ ± 1%25%0Ageomean                                                                          517.6µ%0A%0A                                                              │ ./.tmp/benchmark-941356a.txt │%0A                                                              │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       5.146Mi ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        205.6Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                       30.47Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       172.6Ki ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   3.695Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             9.906Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                         2.820Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         8.594Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           94.20Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    49.32Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       186.7Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                      120.2Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                               1.003Mi ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                    53.29Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       181.3Ki ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 144.0Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                         14.20Ki ± 0%25%0Ageomean                                                                         100.5Ki%0A%0A                                                              │ ./.tmp/benchmark-941356a.txt │%0A                                                              │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        88.14k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         4.190k ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                         848.0 ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        3.145k ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                     132.0 ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                               281.0 ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                          40.63k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                           228.0 ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            1.342k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                      898.0 ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        4.079k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                       2.272k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                                16.45k ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                      929.0 ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        3.992k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  2.447k ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                           394.0 ± 0%25%0Ageomean                                                                          2.063k

@kzantow kzantow enabled auto-merge (squash) August 17, 2023 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Intermittent binary listings, different results every time
3 participants