From 341314e2d8daa469f9e4052175b6bff1f8b81bf2 Mon Sep 17 00:00:00 2001 From: anilb Date: Thu, 25 Jun 2026 10:11:57 +0200 Subject: [PATCH 1/2] fix: deterministic package repo tie-break Signed-off-by: anilb --- services/libs/data-access-layer/src/osspckgs/api.ts | 8 ++++---- services/libs/tinybird/pipes/ossPackages_enriched.pipe | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/libs/data-access-layer/src/osspckgs/api.ts b/services/libs/data-access-layer/src/osspckgs/api.ts index 24850b4b68..a2f5a1d688 100644 --- a/services/libs/data-access-layer/src/osspckgs/api.ts +++ b/services/libs/data-access-layer/src/osspckgs/api.ts @@ -312,7 +312,7 @@ export async function getPackageStatusCounts( FROM package_repos pr JOIN repos r ON r.id = pr.repo_id WHERE pr.package_id = p.id - ORDER BY pr.confidence DESC + ORDER BY pr.confidence DESC, pr.repo_id DESC LIMIT 1 ) r_sc ON true ${where} @@ -492,7 +492,7 @@ export async function listPackagesForApi( FROM package_repos pr JOIN repos r ON r.id = pr.repo_id WHERE pr.package_id = p.id - ORDER BY pr.confidence DESC + ORDER BY pr.confidence DESC, pr.repo_id DESC LIMIT 1 ) r_sc ON true` @@ -714,7 +714,7 @@ export async function getPackageDetailByPurl( SELECT pr2.repo_id, pr2.confidence FROM package_repos pr2 WHERE pr2.package_id = p.id - ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC + ORDER BY pr2.confidence DESC, (pr2.source = 'declared') DESC, pr2.repo_id DESC LIMIT 1 ) pr ON true LEFT JOIN repos r ON r.id = pr.repo_id @@ -781,7 +781,7 @@ export async function listPackagesForScatter( FROM package_repos pr JOIN repos r ON r.id = pr.repo_id WHERE pr.package_id = p.id - ORDER BY pr.confidence DESC + ORDER BY pr.confidence DESC, pr.repo_id DESC LIMIT 1 ) r_sc ON true WHERE p.is_critical = true diff --git a/services/libs/tinybird/pipes/ossPackages_enriched.pipe b/services/libs/tinybird/pipes/ossPackages_enriched.pipe index 6140ae63d0..b35446b039 100644 --- a/services/libs/tinybird/pipes/ossPackages_enriched.pipe +++ b/services/libs/tinybird/pipes/ossPackages_enriched.pipe @@ -18,7 +18,7 @@ SQL > NODE ossPackages_enriched_pkg_repo SQL > - SELECT packageId, argMax(repoId, (toFloat64OrZero(confidence), verifiedAt)) AS repoId, 1 AS hasRepo + SELECT packageId, argMax(repoId, (toFloat64OrZero(confidence), verifiedAt, repoId)) AS repoId, 1 AS hasRepo FROM packageRepos FINAL GROUP BY packageId From ecab2d3e15a69f439c4706d01fb4189ea04e91be Mon Sep 17 00:00:00 2001 From: anilb Date: Thu, 25 Jun 2026 10:33:42 +0200 Subject: [PATCH 2/2] style: format pkg repo pipe node Signed-off-by: anilb --- services/libs/tinybird/pipes/ossPackages_enriched.pipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/libs/tinybird/pipes/ossPackages_enriched.pipe b/services/libs/tinybird/pipes/ossPackages_enriched.pipe index b35446b039..41da11f770 100644 --- a/services/libs/tinybird/pipes/ossPackages_enriched.pipe +++ b/services/libs/tinybird/pipes/ossPackages_enriched.pipe @@ -18,7 +18,10 @@ SQL > NODE ossPackages_enriched_pkg_repo SQL > - SELECT packageId, argMax(repoId, (toFloat64OrZero(confidence), verifiedAt, repoId)) AS repoId, 1 AS hasRepo + SELECT + packageId, + argMax(repoId, (toFloat64OrZero(confidence), verifiedAt, repoId)) AS repoId, + 1 AS hasRepo FROM packageRepos FINAL GROUP BY packageId