From 90ad9e632520d3bbc22562c0fd4db2584ef2a92c Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 15 Nov 2026 16:49:08 +0000 Subject: store: a signed value chosen by seq is named so Where the policy asks for signed values, a place's value is chosen by `seq`, but conflict reports still called the choice `newestWins`, and the code and the architecture still said "newest" of what a read shows. A report names it `highestSeq`; the rest says "the one a read shows". --- docs/api.md | 3 ++- docs/architecture.md | 3 ++- docs/openapi.yaml | 2 +- src/document/store.rs | 18 +++++++++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docs/api.md b/docs/api.md index a839f74..05abf44 100644 --- a/docs/api.md +++ b/docs/api.md @@ -192,7 +192,8 @@ one of another kind (a map written over a list), it is written anew. `?conflicts=true` on a read answers `{"value": …, "conflicts": [...]}`: every place on the way where concurrent values were resolved, with all candidates and which was -selected (`mergedMaps` or `newestWins`). A later write at that path ends the conflict. +selected (`mergedMaps`, `newestWins`, or `highestSeq` for a signed value where the policy +asks for them). A later write at that path ends the conflict. ## Following changes diff --git a/docs/architecture.md b/docs/architecture.md index d867d4a..9edf086 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -55,7 +55,8 @@ the node names its types as `document` re-exports them (`Document`, `ChangeHash` `Change`, `ActorId`) and works through `document`'s functions. Two views of it: * **The store** (`document::store`): JSON over slash-separated paths, with Automerge's - concurrent values merged into one view (maps union, scalars newest-wins) and + concurrent values merged into one view (maps union, scalars newest-wins; where the + policy asks for signed values, a signed value by its `seq` before anything else) and reported on request (`?conflicts=true`). The HTTP API and the remake kinds work through it; nothing else reads Automerge objects directly. Within a list, a path segment is an index (`servers/0/name`); a negative one counts from the end. A key with `/` in it, or diff --git a/docs/openapi.yaml b/docs/openapi.yaml index 5728da5..678cfe3 100644 --- a/docs/openapi.yaml +++ b/docs/openapi.yaml @@ -2173,7 +2173,7 @@ components: description: On the way to the requested path (candidates without values). resolution: type: string - enum: [mergedMaps, newestWins] + enum: [mergedMaps, newestWins, highestSeq] candidates: type: array items: diff --git a/src/document/store.rs b/src/document/store.rs index 9afb5d3..bc50535 100644 --- a/src/document/store.rs +++ b/src/document/store.rs @@ -206,7 +206,7 @@ fn op_order(id: &ObjId) -> (u64, Option<&ActorId>) { enum Resolved { /// Concurrent maps presented as one. Newest first; `[0]` is canonical for writes. Maps(Vec), - /// Any other value: the newest concurrent candidate. + /// Any other value: the concurrent candidate a read shows (`candidates`). Other(Value<'static>, ObjId), } @@ -1222,8 +1222,7 @@ fn parent_for_write(doc: &mut impl Transactable, parents: &[String]) -> Result

Result Result