aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/api.md3
-rw-r--r--docs/architecture.md3
-rw-r--r--docs/openapi.yaml2
-rw-r--r--src/document/store.rs18
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<ObjId>),
- /// 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<P
/// Adds `by` to the counter at `path`, creating one with `by` where there is nothing
/// (in a map: a list's items are only incremented); returns its value then. Increments
/// of one counter on several nodes add up, where writes of numbers would leave one.
-/// Anything else there (the newest of concurrent values, as a read resolves them) is
-/// `NotACounter`.
+/// Anything else there (of concurrent values, the one a read shows) is `NotACounter`.
pub(crate) fn increment_path(
doc: &mut impl Transactable,
path: &[String],
@@ -1273,7 +1272,7 @@ fn counter_at(doc: &impl ReadDoc, parent: &ObjId, prop: Prop) -> Result<i64, Sto
}
}
-/// Casts what is at `path` (the newest of concurrent values, as a read resolves them) to
+/// Casts what is at `path` (of concurrent values, the one a read shows) to
/// `to` (`typed::cast`, timestamps to and from strings in `timestamps`), written as a
/// write of the cast value would be (`write_val_path`); returns where that changed the
/// type. Already `to`: nothing changes. Nothing there: `NotFound`; no cast possible:
@@ -1454,7 +1453,7 @@ pub(crate) fn delete_path_pruning(
/// Copies the merged view of `src` into `dst` as fresh objects.
///
/// * Conflicts collapse exactly as reads resolve them: concurrent maps merge, everything
-/// else keeps the newest candidate.
+/// else keeps the candidate a read shows (`candidates`).
/// * Automerge types survive: text stays text, counters stay counters (normalized to
/// their current value), bytes, timestamps and floats are copied bit-exact.
/// * Map keys are visited in sorted order and list elements in order, so two documents
@@ -1672,6 +1671,9 @@ fn scalar_to_json(scalar: ScalarValue, form: JsonForm) -> Result<JsonValue, Stor
pub(crate) enum Resolution {
MergedMaps,
NewestWins,
+ /// A signed value, by its `seq`, where the policy asks for signed values
+ /// (`candidates`).
+ HighestSeq,
}
#[derive(Debug, Serialize)]
@@ -1764,6 +1766,12 @@ impl ConflictLog {
ancestor: self.in_ancestors,
resolution: if merged {
Resolution::MergedMaps
+ } else if all
+ .first()
+ .is_some_and(|(value, _)| signed_order(value).is_some())
+ && signs_values(doc)
+ {
+ Resolution::HighestSeq
} else {
Resolution::NewestWins
},