From a11f0c8e0f1dd403b6f0f245c11fc8b87c625f38 Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 12 Oct 2026 03:00:34 -0400 Subject: [PATCH] Fix cellular manifest parser alias collision --- docs/engineering/VALIDATION.md | 6 ++++++ migrations/0032_fix_cellular_v3_manifest_normalization.sql | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/engineering/VALIDATION.md b/docs/engineering/VALIDATION.md index a3e2e13..f7922e6 100644 --- a/docs/engineering/VALIDATION.md +++ b/docs/engineering/VALIDATION.md @@ -7079,3 +7079,9 @@ increased the 360-byte manifest to 364 bytes. Migration 32 now intercepts v3 manifests, writes the four-byte little-endian value directly, and delegates to the preserved v27 parser. The PostgreSQL migration integration test covers the v1-to-v2-to-v3 path. CI validation and Harbor image publication are pending. + +CI run #326 compiled the PostgreSQL targets but failed while applying migration +32: it tried to rename the current parser to `parse_checkpoint_manifest_v27`, a +name already created by migration 28. The pending migration now uses the unique +`parse_checkpoint_manifest_v31` alias. The PostgreSQL gate and Harbor image +publication are pending another CI run. diff --git a/migrations/0032_fix_cellular_v3_manifest_normalization.sql b/migrations/0032_fix_cellular_v3_manifest_normalization.sql index ea6e61b..e2ab5a5 100644 --- a/migrations/0032_fix_cellular_v3_manifest_normalization.sql +++ b/migrations/0032_fix_cellular_v3_manifest_normalization.sql @@ -3,7 +3,7 @@ -- enlarged the manifest and the v24 parser correctly rejected it as malformed. -- Preserve v27's parser and intercept v3 manifests before its broken branch. ALTER FUNCTION evolution.parse_checkpoint_manifest(bytea) - RENAME TO parse_checkpoint_manifest_v27; + RENAME TO parse_checkpoint_manifest_v31; CREATE FUNCTION evolution.parse_checkpoint_manifest(m bytea) RETURNS evolution.checkpoint_manifest LANGUAGE plpgsql IMMUTABLE @@ -22,11 +22,11 @@ BEGIN AND evolution.manifest_uint(m, 236, 4) = 1 THEN normalized := overlay(m PLACING v2_bundle FROM 161 FOR 36); normalized := overlay(normalized PLACING decode('03000000', 'hex') FROM 233 FOR 4); - r := evolution.parse_checkpoint_manifest_v27(normalized); + r := evolution.parse_checkpoint_manifest_v31(normalized); r.versions := v3_bundle; RETURN r; END IF; - RETURN evolution.parse_checkpoint_manifest_v27(m); + RETURN evolution.parse_checkpoint_manifest_v31(m); END $$; REVOKE ALL ON FUNCTION evolution.parse_checkpoint_manifest(bytea) FROM PUBLIC;