From 4611f263f3c2a8e1f3e55307d15c155d5c1c134e Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 04:07:31 +0100 Subject: [PATCH] H-A-48: the takeins ask keeps no field of the earlier take-in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pending wait, the abandon, the merge by hand with its repository and sequence, and their ask builders go; an ask naming only one of them is refused as naming no hand act. Builds: design 47 H §744, §764 (the indexer); H-A-48 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- .../internal/index/catalog_test.go | 2 +- .../internal/index/held_test.go | 7 ++ .../internal/index/takein.go | 66 +------------------ 3 files changed, 10 insertions(+), 65 deletions(-) diff --git a/modules/mesh-delivery-indexer/internal/index/catalog_test.go b/modules/mesh-delivery-indexer/internal/index/catalog_test.go index 3b05c598..1e019f82 100644 --- a/modules/mesh-delivery-indexer/internal/index/catalog_test.go +++ b/modules/mesh-delivery-indexer/internal/index/catalog_test.go @@ -78,7 +78,7 @@ func catalogVerbsAnswerFromTheStates(t *testing.T) { }, // The verb seat-definitions answers from the seat definitions state: the trunk's git, never a key an earlier form left. SeatDefinitions: memSource{ - "git.trunk": {Value: []byte(`{"seat":"git","source":"trunk","digest":"d1","definition":{"seat":"git"}}`)}, + "git.trunk": {Value: []byte(`{"seat":"git","source":"trunk","digest":"d1","definition":{"seat":"git"}}`)}, "git.pull.r.1": {Value: []byte(`{"seat":"git","source":"pull","digest":"d2"}`)}, }, } diff --git a/modules/mesh-delivery-indexer/internal/index/held_test.go b/modules/mesh-delivery-indexer/internal/index/held_test.go index 5e90dfd0..5af5a4e6 100644 --- a/modules/mesh-delivery-indexer/internal/index/held_test.go +++ b/modules/mesh-delivery-indexer/internal/index/held_test.go @@ -44,6 +44,13 @@ func TestTheHeldAndPinToolsAskWhatTheIndexerReads(t *testing.T) { if len(recorded) != 2 { t.Errorf("recorded %v, want the skip and the pin drop", recorded) } + // Design 47 H §744, §764 (H-A-48): an ask of the earlier take-in (a pending wait, a merge by hand) names no hand act the + // indexer serves, and is refused, not acted on. + for _, old := range []string{`{"v":1,"pending":"m.12","drop":true,"why":"x"}`, `{"v":1,"merge":"` + "0123456789012345678901234567890123456789" + `","sequence":3}`} { + if _, err := DecodeTakeIn([]byte(old)); err == nil { + t.Errorf("the earlier ask %s is read as a hand act", old) + } + } held := newMem() ix := &Indexer{Held: held} ix.hold(t.Context(), meshdelivery.SourceMovedEvent{Branch: "main", Source: 4, Call: "0123456789abcdef"}, "the catalog store is full") diff --git a/modules/mesh-delivery-indexer/internal/index/takein.go b/modules/mesh-delivery-indexer/internal/index/takein.go index d815fc46..934e19c9 100644 --- a/modules/mesh-delivery-indexer/internal/index/takein.go +++ b/modules/mesh-delivery-indexer/internal/index/takein.go @@ -4,8 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "regexp" - "strings" "time" ) @@ -28,17 +26,6 @@ type TakeInAsk struct { // SeatDefinitions asks a contracts module's trunk seat definitions to be read again now (indexer_seat_definitions_again, // DLV-I19). SeatDefinitions bool `json:"seat-definitions,omitempty"` - // Pending asks the wait under this take-in key to be taken in by hand (indexer_take_in_pending), or with Drop the - // one pending merge under it to be dropped (indexer_drop_pending), instead of a module (pending.go, ADR 0633 §5). - Pending string `json:"pending,omitempty"` - // Abandon, with Drop, drops a pending merge no later merge covers (ADR 0633 §5 asks a later merge; issue 1966, ADR - // 0668 §5): the hand act says why it is abandoned all the same. - Abandon bool `json:"abandon,omitempty"` - // Merge asks the merge of MergeRepository at this commit to be taken in by hand (indexer_take_in_merge): its merged message - // is asked of the forge bridge and run through the take-in as a delivered one, under its stream sequence Sequence. - Merge string `json:"merge,omitempty"` - MergeRepository string `json:"merge-repository,omitempty"` - Sequence uint64 `json:"sequence,omitempty"` // Fingerprints asks the fingerprints of Module ("all": every module) to be computed again now, from the published // packages as they are read (indexer_fingerprints_again, fingerprints.go). Fingerprints bool `json:"fingerprints,omitempty"` @@ -82,57 +69,8 @@ func DecodeTakeIn(data []byte) (TakeInAsk, error) { if a.V != 1 { return a, fmt.Errorf("a takeins value of version %d, not 1", a.V) } - if a.Module == "" && a.Pending == "" && a.Merge == "" && !a.Fingerprints && !a.Recompute && a.CandidateGroup == "" && a.NamedFingerprint == "" && a.PinDrop == "" && a.Held == "" && a.RunDrop == "" && a.Registry == nil { - return a, errors.New("a takeins value naming no module, repository, pending wait or merge") + if a.Module == "" && !a.Fingerprints && !a.Recompute && a.CandidateGroup == "" && a.NamedFingerprint == "" && a.PinDrop == "" && a.Held == "" && a.RunDrop == "" && a.Registry == nil { + return a, errors.New("a takeins value naming no hand act the indexer serves") } return a, nil } - -// TakeInMergeTool takes one merge in by hand, its merged message asked of the forge bridge (ADR 0633 §5, issue 1585). -const TakeInMergeTool = "indexer_take_in_merge" - -var sha40 = regexp.MustCompile(`^[0-9a-f]{40}$`) - -// NewMergeAsk is the value indexer_take_in_merge writes: its key in takeins, `merge.`, and the value. sequence is -// the merge's sequence on the forge bridge's stream, as indexer_heard names it: the pending merge is keyed by it, which -// keeps the merge order. -func NewMergeAsk(repository, merge string, sequence uint64, why, by string, at time.Time) (string, []byte, error) { - repository, merge = strings.TrimSpace(repository), strings.TrimSpace(merge) - switch { - case !strings.Contains(repository, "/"): - return "", nil, errors.New("name the repository as owner/name (repository)") - case !sha40.MatchString(merge): - return "", nil, errors.New("name the merge commit, 40 hex digits (merge)") - case sequence == 0: - return "", nil, errors.New("name the merge's sequence on the forge bridge's stream (sequence), as indexer_heard names it") - case strings.TrimSpace(why) == "": - return "", nil, errors.New("say why (why): a hand act is said in the journal") - } - data, err := json.Marshal(TakeInAsk{V: 1, Merge: merge, MergeRepository: repository, Sequence: sequence, Why: strings.TrimSpace(why), By: by, At: at.UTC()}) - return "merge." + merge, data, err -} - -// NewPendingAsk is the value indexer_take_in_pending (drop false) or indexer_drop_pending (drop true) writes: its key -// in takeins, `pending..`, and the value. key is a wait's key as indexer_pending names it, for a -// drop one pending merge's; abandon drops one no later merge covers. -func NewPendingAsk(key, why, by string, drop, abandon bool, at time.Time) (string, []byte, error) { - key = strings.TrimSpace(key) - if !strings.HasPrefix(key, "m.") && !(strings.HasPrefix(key, "g.") && !drop) { - if drop { - return "", nil, errors.New("name the pending merge to drop by its key, m., as indexer_pending names it") - } - return "", nil, errors.New("name the wait to take in by its key, m. or g., as indexer_pending names it") - } - if strings.TrimSpace(why) == "" { - return "", nil, errors.New("say why (why): a hand act on what waits is said in the journal and on its take-in event") - } - act := "take-in" - if drop { - act = "drop" - } - if abandon && !drop { - return "", nil, errors.New("abandon is a drop's: indexer_take_in_pending takes a wait in") - } - data, err := json.Marshal(TakeInAsk{V: 1, Pending: key, Drop: drop, Abandon: abandon, Why: strings.TrimSpace(why), By: by, At: at.UTC()}) - return "pending." + act + "." + key, data, err -}