Merge branch 'main' into feat/CM-361-part-2

Author: skwowet

backend/src/database/migrations/R__memberEnrichmentMaterializedViews.sql

@@ -10,8 +10,7 @@ where msa."segmentId" IN (
         where "grandparentId" is not null
             and "parentId" is not null
     )
-group by msa."memberId"
-order by sum(msa."activityCount") desc;
+group by msa."memberId";
 create unique index ix_member_global_activity_count_member_id on "membersGlobalActivityCount" ("memberId");
 create index ix_member_global_activity_count on "membersGlobalActivityCount" (total_count);
 

services/apps/members_enrichment_worker/src/activities/enrichment.ts

@@ -765,7 +765,7 @@ export async function getObsoleteSourcesOfMember(
 }
 
 export async function refreshMemberEnrichmentMaterializedView(mvName: string): Promise<void> {
-  await refreshMaterializedView(svc.postgres.writer.connection(), mvName)
+  await refreshMaterializedView(svc.postgres.writer.connection(), mvName, true)
 }
 
 interface IWorkExperienceChanges {

services/apps/members_enrichment_worker/src/workflows/refreshMemberEnrichmentMaterializedViews.ts

@@ -5,7 +5,12 @@ import { MemberEnrichmentMaterializedView } from '@crowd/types'
 import * as activities from '../activities'
 
 const { refreshMemberEnrichmentMaterializedView } = proxyActivities<typeof activities>({
-  startToCloseTimeout: '10 minutes',
+  startToCloseTimeout: '45 minutes',
+  retry: {
+    initialInterval: '15 seconds',
+    backoffCoefficient: 2,
+    maximumAttempts: 3,
+  },
 })
 
 export async function refreshMemberEnrichmentMaterializedViews(): Promise<void> {

services/apps/packages_worker/src/deps-dev/activities/bqExportToGcs.ts

@@ -6,6 +6,7 @@ import {
   findExportedJobByGcsPrefix,
   findLatestExportedJobByKind,
   markJobStatus,
+  mergeJobTableRowCounts,
 } from '@crowd/data-access-layer'
 import { getServiceChildLogger } from '@crowd/logging'
 
@@ -32,6 +33,12 @@ export interface BqExportToGcsInput {
   // is replaced by a server-side maximumBytesBilled cap, since a dry-run only validates the first
   // statement and cannot predict the WHILE loop's total scan. See ADR-0004.
   isScript?: boolean
+  // Fill-constraints run (package_dependencies only): the export is a full Option-A scan but the
+  // downstream merge upserts version_constraint (ON CONFLICT DO UPDATE) instead of DO NOTHING. Full
+  // and fill produce identical parquet, so sync_mode alone can't tell them apart — persist it in the
+  // job meta so a --resume-job run reprocesses the export with the correct merge instead of silently
+  // reverting to DO NOTHING (which skips the backfill).
+  isFill?: boolean
 }
 
 export interface BqExportToGcsOutput {
@@ -53,6 +60,7 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
     exportName,
     ecosystems,
     isScript,
+    isFill,
   } = input
 
   // Named exports use a stable GCS path independent of runId so they survive across bootstrap runs.
@@ -79,6 +87,12 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
           { jobKind, exportName, jobId: prior.id, gcsPrefix: prior.gcsPrefix },
           'exportName match — skipping BQ, loading from named export',
         )
+        // The reusing run drives the chunk merge on this same job row, so meta:fill must reflect
+        // THIS run's intent — write it both ways. Setting it (fill run) stops a later --resume-job
+        // reverting to ON CONFLICT DO NOTHING and skipping the version_constraint backfill; clearing
+        // it (non-fill run reusing a row an earlier fill run set) stops resume forcing an unintended
+        // upsert. Absent and 0 both read back as fill=false (COALESCE in getIngestJobForResume).
+        await mergeJobTableRowCounts(qx, prior.id, { 'meta:fill': isFill ? 1 : 0 })
         return {
           gcsPrefix: prior.gcsPrefix,
           rowCount: prior.rowCountBq,
@@ -115,6 +129,7 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
           tableRowCounts: {
             'bq:export': 0,
             ...(ecosystems ? { 'meta:ecosystems': ecosystems } : {}),
+            ...(isFill ? { 'meta:fill': 1 } : {}),
           },
         })
         return { gcsPrefix: namedPrefix, rowCount: 0, bqBytesBilled: 0, jobId }
@@ -135,6 +150,9 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
           { jobKind, jobId: prior.id, gcsPrefix: prior.gcsPrefix },
           'reuseExports=true — skipping BQ, loading from prior export',
         )
+        // See named-export path above: write THIS run's fill intent both ways so a later
+        // --resume-job matches the most recent run instead of a stale meta value.
+        await mergeJobTableRowCounts(qx, prior.id, { 'meta:fill': isFill ? 1 : 0 })
         return {
           gcsPrefix: prior.gcsPrefix,
           rowCount: prior.rowCountBq,
@@ -163,6 +181,9 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
         { jobKind, jobId: existing.id, gcsPrefix },
         'GCS files already exist — reusing export',
       )
+      // Same-runId reuse (Temporal retry): re-stamp THIS run's fill intent both ways so the flag
+      // always matches the most recent run and can never be lost or left stale on reuse.
+      await mergeJobTableRowCounts(qx, existing.id, { 'meta:fill': isFill ? 1 : 0 })
       return { gcsPrefix, rowCount: existing.rowCountBq, bqBytesBilled: 0, jobId: existing.id }
     }
   }
@@ -212,9 +233,13 @@ export async function bqExportToGcs(input: BqExportToGcsInput): Promise<BqExport
   const provisionalDate = snapshotAt ? new Date(snapshotAt) : null
   const jobId = await createIngestJob(qx, jobKind, syncMode, provisionalDate, exportName)
 
-  // H7: mark exporting before we start the BQ job; store ecosystems filter in table_row_counts JSONB.
+  // H7: mark exporting before we start the BQ job; store ecosystems filter + fill flag in the
+  // table_row_counts JSONB so --resume-job can restore the original export's settings.
+  const exportMeta: Record<string, string | number | string[]> = {}
+  if (ecosystems) exportMeta['meta:ecosystems'] = ecosystems
+  if (isFill) exportMeta['meta:fill'] = 1
   await markJobStatus(qx, jobId, 'exporting', {
-    ...(ecosystems ? { tableRowCounts: { 'meta:ecosystems': ecosystems } } : {}),
+    ...(Object.keys(exportMeta).length > 0 ? { tableRowCounts: exportMeta } : {}),
   })
 
   // From here the row is 'exporting'; any BQ failure (incl. script-mode maximumBytesBilled aborts)

services/apps/packages_worker/src/deps-dev/activities/createVersionsLookup.ts

@@ -4,7 +4,7 @@ import { getPackagesDb } from '../../db'
 
 const log = getServiceChildLogger('createVersionsLookup')
 
-const VALID_ECOSYSTEMS = new Set(['npm', 'go', 'maven', 'pypi', 'nuget', 'cargo'])
+const VALID_ECOSYSTEMS = new Set(['npm', 'go', 'maven', 'pypi', 'nuget', 'cargo', 'rubygems'])
 
 // Builds a persistent UNLOGGED lookup table in the staging schema for the root-version JOIN in
 // ingestDependencies. Using a temp table per chunk would rebuild 4GB for every chunk on npm

services/apps/packages_worker/src/deps-dev/activities/getResumeExport.ts

@@ -0,0 +1,46 @@
+import { getIngestJobForResume } from '@crowd/data-access-layer'
+
+import { getPackagesDb } from '../../db'
+
+export interface GetResumeExportInput {
+  jobId: number
+}
+
+export interface GetResumeExportOutput {
+  jobId: number
+  jobKind: string
+  status: string
+  syncMode: string
+  gcsPrefix: string | null
+  progressDone: number
+  progressTotal: number
+  rowCountPg: number
+  ecosystems: string[] | null
+  fill: boolean
+}
+
+// Pure fetch of a prior job's resume-relevant fields (export path, status, file-load progress,
+// rows merged). Returns null if the job id does not exist. All validation — kind, status, presence
+// of an export, and that the parquet files still exist — is done by the caller (ingestDependencies)
+// so it can fail fast with non-retryable errors instead of retrying a bad-input activity.
+export async function getResumeExport(
+  input: GetResumeExportInput,
+): Promise<GetResumeExportOutput | null> {
+  const qx = await getPackagesDb()
+  const job = await getIngestJobForResume(qx, input.jobId)
+  if (!job) {
+    return null
+  }
+  return {
+    jobId: job.id,
+    jobKind: job.jobKind,
+    status: job.status,
+    syncMode: job.syncMode,
+    gcsPrefix: job.gcsPrefix,
+    progressDone: job.progressDone,
+    progressTotal: job.progressTotal,
+    rowCountPg: job.rowCountPg,
+    ecosystems: job.ecosystems,
+    fill: job.fill,
+  }
+}

services/apps/packages_worker/src/deps-dev/activities/index.ts

@@ -1,14 +1,11 @@
 export * from './bqExportToGcs'
 export * from './setJobStep'
 export * from './createVersionsLookup'
-export * from './managePackageDepsConstraints'
-export * from './managePackageDepsIndexes'
-export * from './manageVersionsConstraints'
-export * from './manageVersionsIndexes'
 export * from './listParquetFiles'
 export * from './gcsParquetToStaging'
 export * from './mergeStagingToTable'
 export * from './getLastSnapshot'
+export * from './getResumeExport'
 export * from './checkDependentCountsGuard'
 export * from './checkEdgeSnapshotQuality'
 export * from './probePartitionExists'