Skip to content

Commit 72eef8d

Browse files
authored
fix: remove criticality_score (#4209)
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent 41a5d19 commit 72eef8d

4 files changed

Lines changed: 6 additions & 30 deletions

File tree

services/apps/packages_worker/src/maven/runMavenEnrichmentLoop.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ async function processNonCriticalPackage(qx: QueryExecutor, pkg: PackageRow): Pr
102102
licensesRaw: null,
103103
latestVersion: null,
104104
ingestionSource: 'packages_universe',
105-
criticalityScore: pkg.criticalityScore,
106105
dependentPackagesCount: pkg.dependentPackagesCount,
107106
dependentReposCount: pkg.dependentReposCount,
108107
})
@@ -142,7 +141,6 @@ async function processCriticalPackage(
142141
licensesRaw: null,
143142
latestVersion: pkg.latestVersion ?? null,
144143
ingestionSource: 'maven_not_on_central',
145-
criticalityScore: pkg.criticalityScore,
146144
dependentPackagesCount: pkg.dependentPackagesCount,
147145
dependentReposCount: pkg.dependentReposCount,
148146
})
@@ -178,7 +176,6 @@ async function processCriticalPackage(
178176
licensesRaw: null,
179177
latestVersion: null,
180178
ingestionSource: 'maven_no_version',
181-
criticalityScore: pkg.criticalityScore,
182179
dependentPackagesCount: pkg.dependentPackagesCount,
183180
dependentReposCount: pkg.dependentReposCount,
184181
})
@@ -189,7 +186,6 @@ async function processCriticalPackage(
189186
// Phase 2: skip full POM extraction when upstream version matches what we already have.
190187
if (!forceFullExtraction && version === pkg.latestVersion) {
191188
await touchPackageSyncedAt(qx, pkg.purl, {
192-
criticalityScore: pkg.criticalityScore,
193189
dependentPackagesCount: pkg.dependentPackagesCount,
194190
dependentReposCount: pkg.dependentReposCount,
195191
})
@@ -217,7 +213,6 @@ async function processCriticalPackage(
217213
licensesRaw: null,
218214
latestVersion: version,
219215
ingestionSource: 'maven_error',
220-
criticalityScore: pkg.criticalityScore,
221216
dependentPackagesCount: pkg.dependentPackagesCount,
222217
dependentReposCount: pkg.dependentReposCount,
223218
})
@@ -246,7 +241,6 @@ async function processCriticalPackage(
246241
versionsCount: metadata.versions.length > 0 ? metadata.versions.length : null,
247242
latestReleaseAt: metadata.lastUpdated,
248243
ingestionSource: 'maven-registry',
249-
criticalityScore: pkg.criticalityScore,
250244
dependentPackagesCount: pkg.dependentPackagesCount,
251245
dependentReposCount: pkg.dependentReposCount,
252246
})

services/apps/packages_worker/src/maven/schedule.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ export async function scheduleMavenCritical(): Promise<void> {
3434
await temporal.schedule.create(scheduleOptions)
3535
} catch (err) {
3636
if (err instanceof ScheduleAlreadyRunning) {
37-
// Schedule exists → delete and recreate so cron/spec changes take effect on
38-
// restart (schedule.create is a no-op when the id exists → it would keep the old cron).
39-
await temporal.schedule.getHandle('maven-critical').delete()
40-
await temporal.schedule.create(scheduleOptions)
41-
svc.log.info('Schedule maven-critical recreated (cron synced).')
37+
svc.log.info('Schedule maven-critical already exists, skipping creation.')
4238
} else {
4339
throw err
4440
}

services/libs/data-access-layer/src/osspckgs/packages.ts

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ export async function findPackageIdsByPurl(
2121
*/
2222
export type MavenPackageToSync = Pick<
2323
IDbPackageUniverse,
24-
| 'id'
25-
| 'namespace'
26-
| 'name'
27-
| 'criticalityScore'
28-
| 'dependentPackagesCount'
29-
| 'dependentReposCount'
24+
'id' | 'namespace' | 'name' | 'dependentPackagesCount' | 'dependentReposCount'
3025
> & {
3126
purl: string
3227
latestVersion: string | null
@@ -51,7 +46,7 @@ const MAVEN_WORKER_OUTCOMES = [
5146
* isCritical=true → Tier 2: reads from `packages` (populated by the criticality
5247
* worker, which writes ingestion_source + last_synced_at).
5348
* A row is due when it hasn't been POM-enriched yet, or is
54-
* stale by refreshDays. Ordered by criticality_score.
49+
* stale by refreshDays. Ordered by dependent_count.
5550
* isCritical=false → disabled non-critical path: reads from `packages_universe`.
5651
* Kept for reference only — the universe→packages copy is owned
5752
* by the criticality worker and this path is not scheduled.
@@ -70,7 +65,6 @@ export async function listMavenPackagesToSync(
7065
p.purl,
7166
p.namespace,
7267
p.name,
73-
p.criticality_score AS "criticalityScore",
7468
p.dependent_count AS "dependentPackagesCount",
7569
p.dependent_repos_count AS "dependentReposCount",
7670
p.latest_version AS "latestVersion"
@@ -85,7 +79,7 @@ export async function listMavenPackagesToSync(
8579
OR p.last_synced_at < NOW() - ($(refreshDays) || ' days')::interval
8680
)
8781
ORDER BY
88-
p.criticality_score DESC NULLS LAST,
82+
p.dependent_count DESC NULLS LAST,
8983
p.id ASC
9084
LIMIT $(limit)
9185
`,
@@ -101,7 +95,6 @@ export async function listMavenPackagesToSync(
10195
pu.purl,
10296
pu.namespace,
10397
pu.name,
104-
pu.criticality_score AS "criticalityScore",
10598
pu.dependent_count AS "dependentPackagesCount",
10699
pu.dependent_repos_count AS "dependentReposCount",
107100
p.latest_version AS "latestVersion"
@@ -136,7 +129,6 @@ export async function touchPackageSyncedAt(
136129
qx: QueryExecutor,
137130
purl: string,
138131
metrics: {
139-
criticalityScore: number | null | undefined
140132
dependentPackagesCount: number | null | undefined
141133
dependentReposCount: number | null | undefined
142134
},
@@ -145,14 +137,12 @@ export async function touchPackageSyncedAt(
145137
`
146138
UPDATE packages SET
147139
last_synced_at = NOW(),
148-
criticality_score = COALESCE($(criticalityScore), criticality_score),
149140
dependent_count = COALESCE($(dependentPackagesCount), dependent_count),
150141
dependent_repos_count = COALESCE($(dependentReposCount), dependent_repos_count)
151142
WHERE purl = $(purl)
152143
`,
153144
{
154145
purl,
155-
criticalityScore: metrics.criticalityScore ?? null,
156146
dependentPackagesCount: metrics.dependentPackagesCount ?? null,
157147
dependentReposCount: metrics.dependentReposCount ?? null,
158148
},
@@ -196,13 +186,13 @@ export async function upsertPackage(
196186
purl, ecosystem, namespace, name,
197187
description, homepage, registry_url, declared_repository_url, repository_url,
198188
licenses, licenses_raw, latest_version, versions_count, latest_release_at,
199-
criticality_score, dependent_count, dependent_repos_count,
189+
dependent_count, dependent_repos_count,
200190
ingestion_source, last_synced_at, created_at
201191
) VALUES (
202192
$(purl), $(ecosystem), $(namespace), $(name),
203193
$(description), $(homepage), $(registryUrl), $(declaredRepositoryUrl), $(repositoryUrl),
204194
$(licenses)::text[], $(licensesRaw), $(latestVersion), $(versionsCount), $(latestReleaseAt),
205-
$(criticalityScore), $(dependentPackagesCount), $(dependentReposCount),
195+
$(dependentPackagesCount), $(dependentReposCount),
206196
$(ingestionSource), NOW(), NOW()
207197
)
208198
ON CONFLICT (purl) DO UPDATE SET
@@ -216,7 +206,6 @@ export async function upsertPackage(
216206
latest_version = COALESCE(EXCLUDED.latest_version, packages.latest_version),
217207
versions_count = COALESCE(EXCLUDED.versions_count, packages.versions_count),
218208
latest_release_at = COALESCE(EXCLUDED.latest_release_at, packages.latest_release_at),
219-
criticality_score = COALESCE(EXCLUDED.criticality_score, packages.criticality_score),
220209
dependent_count = COALESCE(EXCLUDED.dependent_count, packages.dependent_count),
221210
dependent_repos_count = COALESCE(EXCLUDED.dependent_repos_count, packages.dependent_repos_count),
222211
ingestion_source = EXCLUDED.ingestion_source,
@@ -246,7 +235,6 @@ export async function upsertPackage(
246235
repositoryUrl: item.repositoryUrl ?? null,
247236
versionsCount: item.versionsCount ?? null,
248237
latestReleaseAt: item.latestReleaseAt ?? null,
249-
criticalityScore: item.criticalityScore ?? null,
250238
dependentPackagesCount: item.dependentPackagesCount ?? null,
251239
dependentReposCount: item.dependentReposCount ?? null,
252240
},

services/libs/data-access-layer/src/osspckgs/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export interface IDbPackageUniverse {
88
name: string
99
rankInEcosystem: number | null
1010
isCritical: boolean
11-
criticalityScore: number | null
1211
dependentPackagesCount: number | null
1312
dependentReposCount: number | null
1413
downloads30d: bigint | null
@@ -30,7 +29,6 @@ export type IDbPackageUpsert = {
3029
versionsCount?: number | null
3130
latestReleaseAt?: Date | null
3231
ingestionSource: string
33-
criticalityScore?: number | null
3432
dependentPackagesCount?: number | null
3533
dependentReposCount?: number | null
3634
registryUrl?: string | null

0 commit comments

Comments
 (0)