1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
#[derive(Clone)]
pub struct Dict<K, V, Seq> {
live: std::collections::HashMap<K, Value<V, Seq>>,
removed: std::collections::HashMap<K, Seq>,
}
pub struct DictDiff<K, V: crate::Mergable, Seq> {
updates: Vec<(K, Seq, Update<V>)>,
}
impl<
K: std::fmt::Debug,
V: crate::Mergable + std::fmt::Debug,
Seq: std::fmt::Debug
>
std::fmt::Debug for DictDiff<K, V, Seq>
where V::Diff: std::fmt::Debug
{
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "DictDiff(")?;
self.updates.fmt(f)?;
write!(f, ")")
}
}
#[derive(Debug)]
enum Update<V: crate::Mergable> {
Removed,
Diff(V::Diff),
Value(V),
}
impl<
K: Clone + Eq + std::hash::Hash,
V: crate::Mergable,
SF: crate::SequenceFactory,
>
Dict<K, V, crate::Sequence<SF>>
{
pub fn entry<'a>(&'a mut self, key: K) -> DictEntry<'a, K, V, SF> {
match self.live.entry(key) {
std::collections::hash_map::Entry::Occupied(entry) => {
DictEntry::Occupied(DictOccupiedEntry {
entry,
removed: &mut self.removed,
})
}
std::collections::hash_map::Entry::Vacant(entry) => {
DictEntry::Vacant(DictVacantEntry {
entry,
})
}
}
}
pub fn get<
Q: std::hash::Hash + Eq>
(&self, k: &Q) -> Option<&V>
where K: std::borrow::Borrow<Q>
{
self.live.get(k).map(|v| &v.value)
}
pub fn insert(&mut self, ctx: &mut crate::Context<SF>, k: K, v: V) {
self.entry(k).insert(ctx, v);
}
pub fn remove<Q: ?Sized>(&mut self, k: K) -> Option<V>
where
K: std::borrow::Borrow<Q>,
Q: std::hash::Hash + Eq
{
if let DictEntry::Occupied(entry) = self.entry(k) {
Some(entry.remove())
} else {
None
}
}
fn apply(&mut self,
that: impl IntoIterator<Item=(K, crate::Sequence<SF>, Update<V>)>)
-> Result<(), crate::ApplyError>
{
for (k, sequence, value) in that {
match value {
Update::Removed => {
let k = match self.removed.entry(k) {
std::collections::hash_map::Entry::Occupied(mut entry) => {
if entry.get() >= &sequence {
continue
}
entry.insert(sequence.clone());
entry.key().clone()
}
std::collections::hash_map::Entry::Vacant(entry) => {
let k = entry.key().clone();
entry.insert(sequence.clone());
k
}
};
let entry = self.live.entry(k);
if let std::collections::hash_map::Entry::Occupied(entry) = entry {
if entry.get().sequence <= sequence {
eprintln!("remove");
entry.remove();
}
}
}
value => {
match self.live.entry(k) {
std::collections::hash_map::Entry::Occupied(mut entry) => {
let slot = entry.get_mut();
if sequence > slot.sequence {
slot.sequence = sequence;
}
match value {
Update::Removed => unreachable!(),
Update::Diff(d) => slot.value.apply(d)?,
Update::Value(v) => slot.value.merge(v),
}
}
std::collections::hash_map::Entry::Vacant(entry) => {
if let Some(seq) = self.removed.get(entry.key()) {
if seq >= &sequence {
continue
}
}
let value = match value {
Update::Removed => unreachable!(),
Update::Diff(_) => return Err(crate::ApplyError::Missing("Target doesn't contain base value for diff.".into())),
Update::Value(v) => v,
};
entry.insert(Value{
sequence,
value,
});
}
}
}
}
}
Ok(())
}
}
impl<
K: Clone + Eq + std::hash::Hash,
V: Clone + crate::Mergable,
SF: crate::SequenceFactory,
>
crate::Mergable for Dict<K, V, crate::Sequence<SF>>
{
type Diff = DictDiff<K, V, crate::Sequence<SF>>;
fn merge(&mut self, that: Self) {
let removed = that.removed.into_iter()
.map(|(k, sequence)| (k, sequence, Update::Removed));
let live = that.live.into_iter()
.map(|(k, Value{sequence, value})| (k, sequence, Update::Value(value)));
self.apply(removed.chain(live)).unwrap()
}
fn diff(&self, that: &Self) -> Self::Diff {
let mut updates = Vec::new();
for (k, seq) in &self.removed {
if let Some(that_seq) = that.removed.get(k) {
if that_seq == seq {
continue
}
}
updates.push((k.clone(), seq.clone(), Update::Removed));
}
for (k, v) in &self.live {
if let Some(sequence) = that.removed.get(k) {
if sequence >= &v.sequence {
continue
}
}
updates.push((
k.clone(),
v.sequence.clone(),
match that.get(k) {
Some(known) => Update::Diff(v.value.diff(known)),
None => Update::Value(v.value.clone()),
}));
}
DictDiff { updates }
}
fn apply(&mut self, diff: Self::Diff) -> Result<(), crate::ApplyError> {
self.apply(diff.updates)
}
}
impl<
K,
V,
SF,
>
Default for Dict<K, V, SF>
{
fn default() -> Self {
Dict {
live: Default::default(),
removed: Default::default(),
}
}
}
impl<K: Eq + std::hash::Hash, V: PartialEq, Seq> PartialEq for Dict<K, V, Seq> {
fn eq(&self, that: &Self) -> bool {
self.live == that.live
}
}
impl<K: std::fmt::Debug, V: std::fmt::Debug, Seq> std::fmt::Debug for Dict<K, V, Seq> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
self.live.fmt(f)
}
}
#[derive(Clone)]
struct Value<V, Seq> {
sequence: Seq,
value: V,
}
impl<V: PartialEq, Seq> PartialEq for Value<V, Seq> {
fn eq(&self, that: &Self) -> bool {
self.value == that.value
}
}
impl<V: std::fmt::Debug, Seq> std::fmt::Debug for Value<V, Seq> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
self.value.fmt(f)
}
}
pub enum DictEntry<'a, K: 'a, V: 'a, SF: crate::SequenceFactory> {
Occupied(DictOccupiedEntry<'a, K, V, SF>),
Vacant(DictVacantEntry<'a, K, V, SF>),
}
impl<'a,
K: 'a + Eq + std::hash::Hash,
V: 'a + crate::Mergable,
SF: crate::SequenceFactory
>
DictEntry<'a, K, V, SF>
{
pub fn insert(self, ctx: &'a mut crate::Context<SF>, v: V) -> &'a mut V {
match self {
DictEntry::Occupied(mut entry) => {
entry.insert(ctx, v);
entry.into_mut()
}
DictEntry::Vacant(entry) => entry.insert(ctx, v),
}
}
pub fn or_insert(self, ctx: &'a mut crate::Context<SF>, v: V) -> &'a mut V {
match self {
DictEntry::Occupied(mut entry) => {
entry.insert(ctx, v);
entry.into_mut()
}
DictEntry::Vacant(entry) => entry.insert(ctx, v),
}
}
}
pub struct DictOccupiedEntry<'a, K: 'a, V: 'a, SF: crate::SequenceFactory> {
entry: std::collections::hash_map::OccupiedEntry<'a, K, Value<V, crate::Sequence<SF>>>,
removed: &'a mut std::collections::HashMap<K, crate::Sequence<SF>>,
}
impl<'a,
K: 'a + Eq + std::hash::Hash,
V: 'a + crate::Mergable,
SF: crate::SequenceFactory
>
DictOccupiedEntry<'a, K, V, SF>
{
pub fn into_mut(self) -> &'a mut V {
&mut self.entry.into_mut().value
}
pub fn insert(&mut self, ctx: &'a mut crate::Context<SF>, v: V) {
self.entry.get_mut().sequence = ctx.next_sequence();
self.entry.get_mut().value.merge(v);
}
pub fn remove(self) -> V {
let (k, Value{sequence, value}) = self.entry.remove_entry();
self.removed.insert(k, sequence);
value
}
}
pub struct DictVacantEntry<'a, K: 'a, V: 'a, SF: crate::SequenceFactory> {
entry: std::collections::hash_map::VacantEntry<'a, K, Value<V, crate::Sequence<SF>>>,
}
impl<'a, K: 'a, V: 'a, SF: crate::SequenceFactory> DictVacantEntry<'a, K, V, SF> {
pub fn insert(self, ctx: &'a mut crate::Context<SF>, value: V) -> &'a mut V {
&mut self.entry.insert(
Value {
sequence: ctx.next_sequence(),
value,
})
.value
}
}
#[test]
fn test_dict() {
let mut ctx = crate::Context::default();
let one = crate::Cell::new(&mut ctx, "one");
let two = crate::Cell::new(&mut ctx, "two");
let result = crate::test::test_merge(&mut [one.clone(), two.clone()]);
assert_eq!(*result, "two");
let mut parent_l = Dict::default();
parent_l.insert(&mut ctx, 0, two.clone());
let mut parent_r = Dict::default();
parent_r.insert(&mut ctx, 0, one.clone());
let merged = crate::test::test_merge(&mut [parent_l.clone(), parent_r.clone()]);
assert_eq!(merged, parent_l);
let mut child_l = merged.clone();
child_l.insert(&mut ctx, 1, one.clone());
let mut child_r = merged;
child_r.insert(&mut ctx, 2, two.clone());
let merged = crate::test::test_merge(&mut [parent_l, parent_r, child_l, child_r]);
let mut expected = Dict::default();
expected.insert(&mut ctx, 0, two.clone());
expected.insert(&mut ctx, 1, one.clone());
expected.insert(&mut ctx, 2, two.clone());
assert_eq!(merged, expected);
}
#[test]
fn test_dict_remove_old() {
let mut ctx = crate::Context::default();
let one = crate::Cell::new(&mut ctx, "one");
let two = crate::Cell::new(&mut ctx, "two");
let mut parent_l = Dict::default();
parent_l.insert(&mut ctx, 0, two.clone());
let mut parent_r = Dict::default();
parent_r.insert(&mut ctx, 0, one.clone());
parent_l.remove(0);
let merged = crate::test::test_merge(&mut [parent_l.clone(), parent_r.clone()]);
assert_eq!(merged, parent_r);
}
#[test]
fn test_dict_remove_new() {
let mut ctx = crate::Context::default();
let one = crate::Cell::new(&mut ctx, "one");
let two = crate::Cell::new(&mut ctx, "two");
let mut parent_l = Dict::default();
parent_l.insert(&mut ctx, 0, two.clone());
let mut parent_r = Dict::default();
parent_r.insert(&mut ctx, 0, one.clone());
parent_r.remove(0);
let merged = crate::test::test_merge(&mut [parent_l.clone(), parent_r.clone()]);
assert_eq!(merged, parent_r);
}
#[test]
fn test_dict_remove_merge_revive() {
let mut ctx = crate::Context::default();
let one = crate::Cell::new(&mut ctx, "one");
let two = crate::Cell::new(&mut ctx, "two");
let mut root = Dict::default();
root.insert(&mut ctx, 0, two.clone());
let mut child_insert = root.clone();
child_insert.insert(&mut ctx, 0, one.clone());
let mut child_remove = root.clone();
child_remove.remove(0);
let merged = crate::test::test_merge(&mut [child_remove, child_insert.clone()]);
assert_eq!(merged, child_insert);
}