From a0a7a266394557e338860eb8b272349ee44bfc4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Fri, 30 Oct 2026 00:00:53 +0800 Subject: [PATCH] =?UTF-8?q?test(library):=20=E5=86=99=E9=9B=86=E5=90=88?= =?UTF-8?q?=E9=94=9A=E7=82=B9=E4=B8=8E=E6=8E=A5=E7=AE=A1=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 治理侧的摘要登记与取回原先只能连真实治理库验证,等于没有负例。这里把"列版本" 抽成一个最小接口(真实 store 原样满足),并为三个判据补单测:预备份原有证据必须 保留、摘要必须按"作业+目标+预备份"三者匹配才能取回、接管时没有写集合必须失败。 本地验证:go test ./cmd/worker/ -run 'WriteSet|LedgerBackup' 4 项通过; go vet ./cmd/worker/ 无输出。 --- cmd/worker/library_writeset.go | 45 +++++---- cmd/worker/library_writeset_test.go | 149 ++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 17 deletions(-) create mode 100644 cmd/worker/library_writeset_test.go diff --git a/cmd/worker/library_writeset.go b/cmd/worker/library_writeset.go index 77eaa06..ae22794 100644 --- a/cmd/worker/library_writeset.go +++ b/cmd/worker/library_writeset.go @@ -9,7 +9,6 @@ import ( "knowledge-governance/internal/governance" "knowledge-governance/internal/libraryrelease" - postgresstore "knowledge-governance/internal/platform/postgres" v071 "knowledge-governance/internal/releaseadapter/v071" ) @@ -17,9 +16,15 @@ import ( // 为什么不用新表:版本记录本来就绑定 scope + snapshot + 作业,且 id 由这三者 // 决定;把摘要挂上去,重启后按同一身份就能取回,不需要改 schema。 +// libraryVersionLister 只暴露"按 scope 列版本"这一件事:装配真实 store 用, +// 单元测试用假实现,不必为验证摘要锚点去连治理库。 +type libraryVersionLister interface { + LibraryVersions(ctx context.Context, scope string, limit int) ([]governance.LibraryVersion, error) +} + // writeSetDigestOf 读某次作业/某份预备份登记的写集合摘要。 // 读不到就返回错误:缺失必须让调用方失败,不能降级成"没有记录就当没写过"。 -func writeSetDigestOf(ctx context.Context, store *postgresstore.Store, scope, jobID, snapshotID string) (string, error) { +func writeSetDigestOf(ctx context.Context, store libraryVersionLister, scope, jobID, snapshotID string) (string, error) { versions, err := store.LibraryVersions(ctx, scope, 200) if err != nil { return "", fmt.Errorf("读不到版本记录:%w", err) @@ -42,7 +47,7 @@ func writeSetDigestOf(ctx context.Context, store *postgresstore.Store, scope, jo // loadWriteSetForJob 按"作业 + 目标 + 预备份"取回写集合并逐项核对绑定。 // 任何一步不符都返回错误:恢复宁可保持维护,也不许用一份对不上的记录去删目标数据。 -func loadWriteSetForJob(ctx context.Context, store *postgresstore.Store, archiveRoot, scope, jobID, snapshotID string) (*libraryrelease.WriteSet, error) { +func loadWriteSetForJob(ctx context.Context, store libraryVersionLister, archiveRoot, scope, jobID, snapshotID string) (*libraryrelease.WriteSet, error) { digest, err := writeSetDigestOf(ctx, store, scope, jobID, snapshotID) if err != nil { return nil, err @@ -63,6 +68,25 @@ func loadWriteSetForJob(ctx context.Context, store *postgresstore.Store, archive return set, nil } +// writeSetEvidence 在预备份原有证据上追加写集合锚点(纯函数,便于单独验证)。 +// 不能整份替换:备份字节、索引映射这些字段是页面与恢复都在用的。 +func writeSetEvidence(existing map[string]any, set libraryrelease.WriteSet, mappingDigest string) map[string]any { + evidence := map[string]any{} + for key, value := range existing { + evidence[key] = value + } + evidence["backup_snapshot"] = set.BackupSnapshotID + evidence["job"] = set.JobID + if mappingDigest != "" { + evidence["index_mapping_sha256"] = mappingDigest + } + evidence["writeset_digest"] = set.Digest + evidence["writeset_universe_digest"] = set.UniverseDigest() + evidence["writeset_target_snapshot"] = set.TargetSnapshotID + evidence["writeset_rows"] = len(set.Rows) + return evidence +} + // WriteSetPlanned 把写集合摘要登记进"这次作业的预备份版本"证据。 // 它在第一笔写入之前被调用;失败即中止(调用方据此不写目标)。 func (r libraryStageRecorder) WriteSetPlanned(ctx context.Context, set libraryrelease.WriteSet) error { @@ -77,20 +101,7 @@ func (r libraryStageRecorder) WriteSetPlanned(ctx context.Context, set libraryre break } } - evidence := map[string]any{} - for key, value := range existing { - evidence[key] = value - } - // 保留预备份原有证据(备份字节、索引映射等),只追加写集合锚点。 - evidence["backup_snapshot"] = set.BackupSnapshotID - evidence["job"] = set.JobID - if r.mappingDigest != "" { - evidence["index_mapping_sha256"] = r.mappingDigest - } - evidence["writeset_digest"] = set.Digest - evidence["writeset_universe_digest"] = set.UniverseDigest() - evidence["writeset_target_snapshot"] = set.TargetSnapshotID - evidence["writeset_rows"] = len(set.Rows) + evidence := writeSetEvidence(existing, set, r.mappingDigest) return r.store.RecordLibraryVersion(ctx, governance.LibraryVersion{ ID: governance.LibraryVersionID(governance.LibraryVersionProductionPrebackup, r.scope, set.BackupSnapshotID), Scope: r.scope, Kind: governance.LibraryVersionProductionPrebackup, SnapshotID: set.BackupSnapshotID, diff --git a/cmd/worker/library_writeset_test.go b/cmd/worker/library_writeset_test.go new file mode 100644 index 0000000..e37b397 --- /dev/null +++ b/cmd/worker/library_writeset_test.go @@ -0,0 +1,149 @@ +package main + +import ( + "context" + "errors" + "os" + "path/filepath" + "testing" + "time" + + "knowledge-governance/internal/governance" + "knowledge-governance/internal/libraryrelease" + v071 "knowledge-governance/internal/releaseadapter/v071" +) + +// 这里验证的是"治理侧的锚点":摘要真的写进版本证据、能按作业+目标+预备份取回, +// 并且任何一步对不上都返回错误(调用方据此不写目标 / 保持维护)。 +// 归档文件的读写在 v071 的写集合用例里用真实文件验证。 + +type fakeVersionStore struct { + versions []governance.LibraryVersion + recorded *governance.LibraryVersion + err error +} + +func (f *fakeVersionStore) LibraryVersions(context.Context, string, int) ([]governance.LibraryVersion, error) { + if f.err != nil { + return nil, f.err + } + return f.versions, nil +} + +func (f *fakeVersionStore) RecordLibraryVersion(_ context.Context, version governance.LibraryVersion) error { + f.recorded = &version + return nil +} + +func sealedLedger(t *testing.T, digest string) libraryrelease.WriteSet { + t.Helper() + set := libraryrelease.WriteSet{Version: libraryrelease.WriteSetVersion, JobID: "job-1", Target: "internal", + TenantID: 10001, KnowledgeBaseID: "kb", BackupSnapshotID: "backup-snap", + TargetSnapshotID: "target-snap", CreatedAt: time.Now().UTC(), + Rows: []libraryrelease.WriteSetRow{{Table: "resources", ID: "res-new"}}, + Universe: map[string]libraryrelease.TableFingerprint{"resources": {Count: 2, Digest: "d"}}} + if err := set.Seal(); err != nil { + t.Fatal(err) + } + return set +} + +func TestWriteSetEvidenceKeepsBackupEvidenceAndAddsAnchor(t *testing.T) { + set := sealedLedger(t, "") + evidence := writeSetEvidence(map[string]any{"backup_bytes": int64(4096), "index_mapping_sha256": "old"}, set, "mapping-1") + if evidence["backup_bytes"] != int64(4096) { + t.Fatalf("原预备份证据必须保留:%v", evidence) + } + if evidence["writeset_digest"] != set.Digest { + t.Fatalf("writeset_digest = %v, want %s", evidence["writeset_digest"], set.Digest) + } + if evidence["writeset_universe_digest"] != set.UniverseDigest() || evidence["writeset_universe_digest"] == "" { + t.Fatalf("整实例证据摘要必须登记:%v", evidence) + } + if evidence["index_mapping_sha256"] != "mapping-1" { + t.Fatalf("当前索引映射必须覆盖旧值:%v", evidence) + } + if evidence["writeset_job"] != nil && evidence["job"] != "job-1" { + t.Fatalf("写集合必须绑定作业:%v", evidence) + } +} + +func TestWriteSetDigestLookupRequiresJobTargetAndSnapshotMatch(t *testing.T) { + store := &fakeVersionStore{versions: []governance.LibraryVersion{ + {ID: "v1", Scope: "internal", Kind: governance.LibraryVersionProductionPrebackup, SnapshotID: "backup-snap", + SourceJobID: "job-1", Evidence: map[string]any{"writeset_digest": "digest-1"}}, + {ID: "v2", Scope: "internal", Kind: governance.LibraryVersionProductionPrebackup, SnapshotID: "backup-snap", + SourceJobID: "job-2", Evidence: map[string]any{"writeset_digest": "digest-2"}}, + }} + digest, err := writeSetDigestOf(context.Background(), store, "internal", "job-1", "backup-snap") + if err != nil || digest != "digest-1" { + t.Fatalf("digest = %q, err = %v", digest, err) + } + // 别的作业的版本不能被拿来用。 + if _, err := writeSetDigestOf(context.Background(), store, "internal", "job-3", "backup-snap"); err == nil { + t.Fatal("找不到本作业的版本时必须失败") + } + // 有版本但没登记摘要 → 失败(不许当成"没有写集合"降级)。 + missing := &fakeVersionStore{versions: []governance.LibraryVersion{{Kind: governance.LibraryVersionProductionPrebackup, + SnapshotID: "backup-snap", SourceJobID: "job-1", Evidence: map[string]any{}}}} + if _, err := writeSetDigestOf(context.Background(), missing, "internal", "job-1", "backup-snap"); err == nil { + t.Fatal("没有写集合摘要时必须失败") + } + // 读不到版本 → 失败。 + if _, err := writeSetDigestOf(context.Background(), &fakeVersionStore{err: errors.New("db down")}, + "internal", "job-1", "backup-snap"); err == nil { + t.Fatal("版本查询失败必须向上传递") + } +} + +func TestLoadWriteSetForJobChecksBinding(t *testing.T) { + root := t.TempDir() + set := sealedLedger(t, "") + if _, err := v071.PersistWriteSet(root, &set); err != nil { + t.Fatal(err) + } + store := &fakeVersionStore{versions: []governance.LibraryVersion{{Kind: governance.LibraryVersionProductionPrebackup, + SnapshotID: "backup-snap", SourceJobID: "job-1", Evidence: map[string]any{"writeset_digest": set.Digest}}}} + loaded, err := loadWriteSetForJob(context.Background(), store, root, "internal", "job-1", "backup-snap") + if err != nil { + t.Fatalf("load: %v", err) + } + if loaded.Digest != set.Digest { + t.Fatalf("digest = %s", loaded.Digest) + } + // 目标不一致 → 拒绝(同一份记录不能被拿去恢复另一个目标)。 + if _, err := loadWriteSetForJob(context.Background(), store, root, "external", "job-1", "backup-snap"); err == nil { + t.Fatal("目标不一致时必须失败") + } + // 作业不一致 → 拒绝。 + if _, err := loadWriteSetForJob(context.Background(), store, root, "internal", "job-2", "backup-snap"); err == nil { + t.Fatal("作业不一致时必须失败") + } + // 记录文件被删 → 拒绝。 + if err := os.Chmod(filepath.Join(root, "writesets", set.Digest+".json"), 0600); err != nil { + t.Fatal(err) + } + if err := os.Remove(filepath.Join(root, "writesets", set.Digest+".json")); err != nil { + t.Fatal(err) + } + if _, err := loadWriteSetForJob(context.Background(), store, root, "internal", "job-1", "backup-snap"); err == nil { + t.Fatal("写集合文件缺失时必须失败") + } +} + +// 接管用的预备份来源:没有写集合就不许继续(返回错误,而不是给一个空引用)。 +func TestLedgerBackupStoreRefusesWithoutWriteSet(t *testing.T) { + store := ledgerBackupStore{ref: libraryrelease.BackupRef{ID: "backup-1", SnapshotID: "backup-snap"}} + if _, err := store.Prepare(context.Background(), "target-snap", libraryrelease.CurrentState{}); err == nil { + t.Fatal("没有写集合时接管必须失败") + } + set := sealedLedger(t, "") + store.write = &set + ref, err := store.Prepare(context.Background(), "target-snap", libraryrelease.CurrentState{}) + if err != nil { + t.Fatalf("prepare: %v", err) + } + if ref.WriteSet == nil || ref.WriteSet.Digest != set.Digest { + t.Fatalf("接管必须带上持久化的写集合:%+v", ref) + } +}