From 204cf3e16a91a5be63042560684c270d9a98b575 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 03:54:27 +0100 Subject: [PATCH] H-A-80: indexer_consumer goes with the state consumers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No ledger writes the state consumers any more, so the tool indexer_consumer, its reader and the state's declaration go; the manifest test holds their absence. Builds: design 47 H §764 (the indexer); H-A-80 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- .../cmd/mesh-delivery-indexer-tools/main.go | 2 - .../internal/index/pins.go | 44 ------------------- .../mesh-delivery-indexer/manifest_test.go | 7 ++- modules/mesh-delivery-indexer/module.json | 2 - 4 files changed, 3 insertions(+), 52 deletions(-) diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/main.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/main.go index 202020ac..4d2b8d89 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/main.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer-tools/main.go @@ -20,7 +20,6 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/busstate" - "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" "mesh-delivery-indexer/internal/index" @@ -264,7 +263,6 @@ func main() { _, err := acts.Record(meshhandactsclient.Request{What: what, Why: why, Cause: index.RunDropTool, Verb: "run-drop"}) return err })...) - tools = append(tools, index.ConsumerTools(keptRead{stdio.State(process.ConsumersState)})...) tools = append(tools, index.RegistrationTools(keptRead{stdio.State(index.RegistrationsState)}, keptRead{stdio.State(index.ProposalsState)}, asks, time.Now, func(cause, verb, what, why string) error { _, err := acts.Record(meshhandactsclient.Request{What: what, Why: why, Cause: cause, Verb: verb}) return err diff --git a/modules/mesh-delivery-indexer/internal/index/pins.go b/modules/mesh-delivery-indexer/internal/index/pins.go index 765f162b..63b9b15c 100644 --- a/modules/mesh-delivery-indexer/internal/index/pins.go +++ b/modules/mesh-delivery-indexer/internal/index/pins.go @@ -16,7 +16,6 @@ import ( runner "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner" stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/keys" - "git.novox.be/novox/mesh-sdk/go/process" ) // The indexer keeps the records pinning each catalog graph revision and removes a revision only on an event (design 47 G §153, @@ -433,46 +432,3 @@ func PinsTools(pins Store, o Objects, ask func(key string, value []byte) (TakeIn }}, } } - -// ConsumerTool is indexer_consumer (class read): each durable consumer of the indexer as the process keeps it in the state consumers -// (process.ConsumerLedger, A-176): its stream, name, acknowledged sequence, the messages pending, the last event applied with its -// `at`, and when the oldest message delivered and not yet applied was delivered. -const ConsumerTool = "indexer_consumer" - -// ConsumersAnswer is what indexer_consumer answers. -type ConsumersAnswer struct { - Consumers []process.ConsumerFacts `json:"consumers"` -} - -// ReadConsumers reads the state consumers. -func ReadConsumers(ctx context.Context, st Store) (ConsumersAnswer, error) { - out := ConsumersAnswer{Consumers: []process.ConsumerFacts{}} - ks, err := st.Keys(ctx) - if err != nil { - return out, fmt.Errorf("the state %s cannot be read: %w", process.ConsumersState, err) - } - slices.Sort(ks) - for _, k := range ks { - v, _, found, err := st.Get(ctx, k) - if err != nil || !found { - continue - } - var f process.ConsumerFacts - if err := json.Unmarshal(v, &f); err != nil { - return out, fmt.Errorf("%s.%s: %w", process.ConsumersState, k, err) - } - out.Consumers = append(out.Consumers, f) - } - return out, nil -} - -// ConsumerTools is indexer_consumer. -func ConsumerTools(st Store) []stdio.Tool { - return []stdio.Tool{{Name: ConsumerTool, - Description: "Each durable consumer of the indexer, as its process keeps it in the state consumers after each event it applies: its stream " + - "and name, the acknowledged sequence, the messages pending, the last event applied with its time, and when the oldest message delivered " + - "and not yet applied was delivered. The pins events (mesh-delivery's pinned, freed, heads-replaced and pins-stated) come through it; " + - "indexer_pins reads what they kept.", - Input: map[string]any{"type": "object", "properties": map[string]any{}}, - Run: func(map[string]any) (any, error) { return ReadConsumers(context.Background(), st) }}} -} diff --git a/modules/mesh-delivery-indexer/manifest_test.go b/modules/mesh-delivery-indexer/manifest_test.go index e66c9f87..497861cb 100644 --- a/modules/mesh-delivery-indexer/manifest_test.go +++ b/modules/mesh-delivery-indexer/manifest_test.go @@ -16,7 +16,6 @@ import ( "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-indexer/takein" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/process" "git.novox.be/novox/mesh-sdk/go/views" "mesh-delivery-indexer/internal/index" @@ -137,7 +136,7 @@ func TestManifestDeclarations(t *testing.T) { // 1238/AC1, 1444 (reads the build {Name: index.RequirementsState, History: 5}, {Name: index.SeatDefinitionsState, History: 5}, {Name: index.EntryIndexState, History: 1, MaxMiB: 8}, {Name: index.NamedState, History: 1, MaxMiB: 4}, // design 47 G §695 {Name: index.RegistrationsState, History: 1}, {Name: index.ProposalsState, History: 1, MaxMiB: 4}, - {Name: index.VersionsState, History: 1, MaxMiB: 64}, {Name: index.BuildEdgesState, History: 1}, {Name: index.InputsState, History: 1}, {Name: index.PinsState, History: 1, MaxMiB: index.PinsCapMiB}, {Name: process.ConsumersState, History: 1}, {Name: index.HeldState, History: 1}}; !reflect.DeepEqual(m.State, want) { // DLV-I7, DLV-I17 + {Name: index.VersionsState, History: 1, MaxMiB: 64}, {Name: index.BuildEdgesState, History: 1}, {Name: index.InputsState, History: 1}, {Name: index.PinsState, History: 1, MaxMiB: index.PinsCapMiB}, {Name: index.HeldState, History: 1}}; !reflect.DeepEqual(m.State, want) { // DLV-I7, DLV-I17 t.Errorf("state = %+v, want %+v", m.State, want) } // Milestone 47/G W4.2 (design 47, Two graphs; ADR 0619 §2): the catalog graph revisions are objects in the old section, @@ -204,8 +203,8 @@ func TestManifestDeclarations(t *testing.T) { // 1238/AC1, 1444 (reads the build // milestone 47/G W4.12 (design 47, the indexer's tools): the catalog graph revisions read and steered. index.CatalogRevisionTool, index.CatalogRevisionsTool, index.CandidateGraphsTool, index.RecomputeTool, index.DropCandidateGraphTool, index.EntryIndexTool, index.NamedDropTool, // design 47 G §675 - index.ProposalsTool, index.ProposalDropTool, index.SeedAgainTool, index.InputsTool, index.PinsTool, index.PinDropTool, index.PendingTool, index.TakeInPendingTool, index.TakeInSkipTool, index.ConsumerTool, index.RunsTool, index.RunDropTool) // design 47 G §667, §8, §579, §64 (A-194) - if !reflect.DeepEqual(m.Tools, want) || len(want) != 44 || !slices.Contains(m.Tools, "modules") { + index.ProposalsTool, index.ProposalDropTool, index.SeedAgainTool, index.InputsTool, index.PinsTool, index.PinDropTool, index.PendingTool, index.TakeInPendingTool, index.TakeInSkipTool, index.RunsTool, index.RunDropTool) // design 47 G §667, §8, §579, §64 (A-194) + if !reflect.DeepEqual(m.Tools, want) || len(want) != 43 || !slices.Contains(m.Tools, "modules") { t.Errorf("tools = %v, want %v", m.Tools, want) } // Design 47 G §2, §9: every version of every registration is kept with no age limit, 64 MiB, on the old streams section. diff --git a/modules/mesh-delivery-indexer/module.json b/modules/mesh-delivery-indexer/module.json index d482e2da..302f873b 100644 --- a/modules/mesh-delivery-indexer/module.json +++ b/modules/mesh-delivery-indexer/module.json @@ -68,7 +68,6 @@ "indexer_pending", "indexer_take_in_pending", "indexer_take_in_skip", - "indexer_consumer", "indexer_runs", "indexer_run_drop" ], @@ -119,7 +118,6 @@ { "name": "build-edges", "history": 1 }, { "name": "inputs", "history": 1 }, { "name": "pins", "history": 1, "max-mib": 4 }, - { "name": "consumers", "history": 1 }, { "name": "held", "history": 1 } ], "streams": [