lix 0.18.0

Embeddable version control for apps and AI agents.
Documentation
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
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
//! Actual HTTP receipt recovery for concurrent native descriptor additions.
use super::*;
use crate::server_protocol::{LixServerProtocol, ServerProtocolBody, ServerProtocolContext};
use crate::sync::SyncTransportFuture;
use crate::sync::http::{HttpSyncTransport, RawHttpClient, RawHttpRequest, RawHttpResponse};
use http_body_util::BodyExt;
use std::sync::{
    Arc,
    atomic::{AtomicBool, Ordering},
};
#[derive(Clone)]
struct GlobalClient {
    server: LixServerProtocol<Memory>,
    lose_merge: Arc<AtomicBool>,
    lose_ordinary: Arc<AtomicBool>,
    lose_cleanup: Arc<AtomicBool>,
}
impl RawHttpClient for GlobalClient {
    fn send(&self, request: RawHttpRequest) -> SyncTransportFuture<'_, RawHttpResponse> {
        Box::pin(async move {
            let merge = request.url.ends_with("/sync/migration/global/merge");
            let ordinary = request.url.ends_with("/sync/push");
            let cleanup = request.url.ends_with("/sync/migration/global/cleanup");
            let mut builder = http::Request::builder()
                .method(request.method)
                .uri(request.url);
            for (name, value) in request.headers {
                builder = builder.header(name, value);
            }
            let response = self
                .server
                .handle(
                    builder
                        .body(ServerProtocolBody::from(request.body.unwrap_or_default()))
                        .unwrap(),
                    ServerProtocolContext::anonymous(),
                )
                .await;
            let status = response.status();
            let body = response
                .into_body()
                .collect()
                .await
                .map_err(|e| LixError::unknown(e.to_string()))?
                .to_bytes()
                .to_vec();
            assert!(body.len() <= request.response_limit);
            if merge && status.is_success() && self.lose_merge.swap(false, Ordering::SeqCst) {
                return Err(LixError::new(
                    "TEST_LOST_GLOBAL_MERGE_REPLY",
                    "native M committed before disconnect",
                ));
            }
            if ordinary && status.is_success() && self.lose_ordinary.swap(false, Ordering::SeqCst) {
                return Err(LixError::new(
                    "TEST_LOST_ORDINARY_REPLY",
                    "native creation group committed before disconnect",
                ));
            }
            if cleanup && status.is_success() && self.lose_cleanup.swap(false, Ordering::SeqCst) {
                return Err(LixError::new(
                    "TEST_LOST_GLOBAL_CLEANUP_REPLY",
                    "pin cleanup committed before disconnect",
                ));
            }
            Ok(RawHttpResponse {
                status: status.as_u16(),
                status_text: status.to_string(),
                body,
            })
        })
    }
}
async fn replica(
    transport: &HttpSyncTransport<GlobalClient>,
) -> (
    Arc<Engine<Memory>>,
    SessionContext<Memory>,
    Arc<PartialReplicaState>,
) {
    let wrapper = transport.partial_replica_descriptor(None).await.unwrap();
    let old = Arc::new(
        PartialReplicaState::from_leased(
            transport.protocol_url().into(),
            crate::ANONYMOUS_ACCOUNT_ID.into(),
            uuid::Uuid::now_v7().to_string(),
            wrapper.wire,
        )
        .unwrap(),
    );
    let storage = StorageAdapter::new(Memory::new());
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut writes = storage.new_write_set();
    let preconditions = stage_partial_bootstrap(&read, &mut writes, &old).unwrap();
    crate::init::stage_partial_repository_protocol(&mut writes);
    drop(read);
    storage
        .commit_write_set(
            writes,
            StorageWriteOptions {
                preconditions,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    let (engine, session) =
        Engine::new_partial_replica(storage.clone(), EngineOptions::new(), &old)
            .await
            .unwrap();
    let engine = Arc::new(engine);
    engine
        .sync_mode()
        .admit_partial_replica(old.clone(), crate::sync::partial_replica_write_capability());
    storage.admit_partial_replica_writer(crate::sync::partial_replica_write_capability());
    (engine, session, old)
}
async fn create_local(
    session: &SessionContext<Memory>,
    engine: &Engine<Memory>,
    state: &PartialReplicaState,
    transport: &HttpSyncTransport<GlobalClient>,
    name: &str,
) -> String {
    let lease = transport
        .fork_native_baseline_lease(state.baseline_lease())
        .unwrap();
    let branch_id = uuid::Uuid::now_v7().to_string();
    let mut seen = BTreeSet::new();
    for _ in 0..512 {
        match session
            .create_branch(crate::CreateBranchOptions {
                id: Some(branch_id.clone()),
                name: name.into(),
                from_commit_id: None,
            })
            .await
        {
            Ok(branch) => return branch.id,
            Err(error) => {
                let demand = crate::sync::runtime::native_sync_demand_request_for_error(&error)
                    .unwrap()
                    .unwrap_or_else(|| panic!("unexpected create error: {error:?}"));
                assert!(
                    seen.insert(format!("{demand:?}")),
                    "repeated create dependency"
                );
                crate::sync::partial_runtime::hydrate_demand(
                    &engine.storage(),
                    state,
                    &lease,
                    demand,
                )
                .await
                .unwrap();
            }
        }
    }
    panic!("branch creation exceeded bounded native hydration");
}
async fn run_concurrent_global_creation(newer_global: bool) {
    let backing = Memory::new();
    let authority = open_lix().with_storage(backing.clone()).await.unwrap();
    authority
        .set_sync_role(crate::sync::SyncRole::Authority)
        .unwrap();
    authority
        .execute(
            "INSERT INTO lix_key_value(key,value) VALUES('resident','unchanged'),('race','before')",
            &[],
        )
        .await
        .unwrap();
    let server = open_lix()
        .with_storage(backing)
        .serve()
        .with_embedded_lix_id()
        .await
        .unwrap();
    let lost = Arc::new(AtomicBool::new(false));
    let lost_cleanup = Arc::new(AtomicBool::new(false));
    let transport = HttpSyncTransport::connect_with(
        GlobalClient {
            server,
            lose_merge: lost.clone(),
            lose_ordinary: Arc::new(AtomicBool::new(false)),
            lose_cleanup: lost_cleanup.clone(),
        },
        &format!("https://example.test/lix/{}", authority.lix_id()),
    )
    .await
    .unwrap();
    let (a, sa, base_a) = replica(&transport).await;
    let (b, sb, base_b) = replica(&transport).await;
    let storage_b = b.storage();
    execute_hydrating(
        &sb,
        &storage_b,
        &base_b,
        &authority,
        "SELECT value FROM lix_key_value WHERE key IN ('resident','race')",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    let child_a = create_local(&sa, &a, &base_a, &transport, "concurrent-a").await;
    let child_b = create_local(&sb, &b, &base_b, &transport, "concurrent-b").await;
    let storage_a = a.storage();
    let state_ref = base_a.as_ref();
    let storage_ref = &storage_a;
    let transport_ref = &transport;
    assert!(
        crate::sync::partial_upload_cycle::upload_partial_once(
            &storage_a,
            &base_a,
            crate::GLOBAL_BRANCH_ID,
            uuid::Uuid::now_v7().to_string(),
            32,
            1024 * 1024,
            |request| async move {
                crate::sync::partial_blob_upload::push_partial_with_blobs(
                    storage_ref,
                    state_ref,
                    transport_ref,
                    &request,
                )
                .await
            }
        )
        .await
        .unwrap()
    );
    lost.store(true, Ordering::SeqCst);
    let result = crate::sync::partial_global_merge_runtime::prepare_descriptor_with_global_merge(
        b.clone(),
        base_b.clone(),
        &transport,
        transport.partial_replica_descriptor(None).await.unwrap(),
        crate::sync::partial_publication::PartialRecoveryPolicy::Normal,
    )
    .await;
    assert_eq!(result.err().unwrap().code, "TEST_LOST_GLOBAL_MERGE_REPLY");
    let head = transport
        .partial_replica_descriptor(None)
        .await
        .unwrap()
        .wire
        .descriptor
        .global_branch
        .head
        .commit_id;
    let read = storage_b.begin_read(Default::default()).await.unwrap();
    let pending =
        crate::sync::partial_global_merge_state::load_partial_global_merge_state(&read, &base_b)
            .await
            .unwrap()
            .0
            .unwrap();
    assert!(pending.receipt.is_none());
    assert_eq!(pending.acknowledged_roots.len(), 2);
    drop(read);
    let child_c = if newer_global {
        Some(create_local(&sb, &b, &base_b, &transport, "concurrent-c-after-capture").await)
    } else {
        None
    };
    // This bare session has no public SQL demand worker. Resolve only the
    // exact dependencies reported by the UPDATE after its GLOBAL basis changed.
    let lease = transport
        .fork_native_baseline_lease(base_b.baseline_lease())
        .unwrap();
    let mut seen = BTreeSet::new();
    loop {
        match sb
            .execute(
                "UPDATE lix_key_value SET value='after-capture' WHERE key='race'",
                &[],
            )
            .await
        {
            Ok(_) => break,
            Err(error) => {
                let demand = crate::sync::runtime::native_sync_demand_request_for_error(&error)
                    .unwrap()
                    .unwrap_or_else(|| panic!("unexpected race UPDATE error: {error:?}"));
                assert!(
                    seen.len() < 512 && seen.insert(format!("{demand:?}")),
                    "repeated race UPDATE dependency"
                );
                crate::sync::partial_runtime::hydrate_demand(&storage_b, &base_b, &lease, demand)
                    .await
                    .unwrap();
            }
        }
    }
    let mut prepared =
        crate::sync::partial_global_merge_runtime::prepare_descriptor_with_global_merge(
            b.clone(),
            base_b.clone(),
            &transport,
            transport.partial_replica_descriptor(None).await.unwrap(),
            crate::sync::partial_publication::PartialRecoveryPolicy::Normal,
        )
        .await
        .unwrap();
    if newer_global {
        assert!(matches!(
            prepared,
            crate::sync::partial_reconcile::PreparedDescriptor::LocalProgress
        ));
        let read = storage_b.begin_read(Default::default()).await.unwrap();
        let (push, _, _) = crate::sync::partial_push_state::load_partial_push_state(
            &read,
            &base_b,
            crate::GLOBAL_BRANCH_ID,
        )
        .await
        .unwrap();
        let control =
            crate::branch::observe_branch_control_coordinate(&read, crate::GLOBAL_BRANCH_ID)
                .await
                .unwrap()
                .control
                .unwrap();
        assert_eq!(
            push.confirmed.head,
            pending.request.captured_local_head_commit_id
        );
        assert_ne!(
            control.head_commit_id.to_string(),
            push.confirmed.head,
            "prefix ACK must preserve L2"
        );
        drop(read);
        prepared = crate::sync::partial_global_merge_runtime::prepare_descriptor_with_global_merge(
            b.clone(),
            base_b.clone(),
            &transport,
            transport.partial_replica_descriptor(None).await.unwrap(),
            crate::sync::partial_publication::PartialRecoveryPolicy::Normal,
        )
        .await
        .unwrap();
    }
    let crate::sync::partial_reconcile::PreparedDescriptor::Ready(prepared) = prepared else {
        panic!("expected GLOBAL adoption")
    };
    crate::sync::partial_publication::publish_prepared_partial(b.clone(), prepared)
        .await
        .unwrap();
    let final_head = transport
        .partial_replica_descriptor(None)
        .await
        .unwrap()
        .wire
        .descriptor
        .global_branch
        .head
        .commit_id;
    if newer_global {
        assert_ne!(final_head, head, "L2 requires its own native merge");
    } else {
        assert_eq!(
            final_head, head,
            "lost reply retry must not create another M"
        );
    }
    for child in [&child_a, &child_b].into_iter().chain(child_c.iter()) {
        assert_eq!(
            transport
                .partial_replica_descriptor(Some(child))
                .await
                .unwrap()
                .wire
                .descriptor
                .selected_branch
                .branch_id,
            *child
        );
    }
    let current = b.sync_mode().partial_admission().unwrap();
    lost_cleanup.store(true, Ordering::SeqCst);
    let error = crate::sync::partial_global_merge_runtime::cleanup_adopted_global_attempt(
        &storage_b, &current, &transport,
    )
    .await
    .unwrap_err();
    assert_eq!(error.code, "TEST_LOST_GLOBAL_CLEANUP_REPLY");
    let read = storage_b.begin_read(Default::default()).await.unwrap();
    assert!(
        crate::sync::partial_global_merge_state::load_partial_global_merge_state(&read, &current)
            .await
            .unwrap()
            .0
            .unwrap()
            .upload_settled
    );
    drop(read);

    assert!(
        crate::sync::partial_global_merge_runtime::cleanup_adopted_global_attempt(
            &b.storage(),
            &current,
            &transport
        )
        .await
        .unwrap()
    );
    assert!(
        !crate::sync::partial_global_merge_runtime::cleanup_adopted_global_attempt(
            &b.storage(),
            &current,
            &transport
        )
        .await
        .unwrap()
    );
    transport
        .bind_native_baseline_lease(current.baseline_lease())
        .unwrap();
    // Ordinary foreground observation owns cold-input hydration after adoption.
    let (sender, mut receiver) = tokio::sync::mpsc::channel::<crate::sync::SyncDemand>(4);
    let reads = async {
        for (key, expected) in [("race", "after-capture"), ("resident", "unchanged")] {
            let mut events = sb
                .observe(
                    "SELECT value FROM lix_key_value WHERE key=$1",
                    &[Value::Text(key.into())],
                )
                .unwrap()
                .with_sync_demand_sender(Some(sender.clone()));
            let result = events.next().await.unwrap().unwrap();
            assert_eq!(value(result.rows), expected);
        }
        drop(sender);
    };
    let hydrate = async {
        while let Some(demand) = receiver.recv().await {
            let result = crate::sync::partial_runtime::hydrate_demand(
                &storage_b,
                &current,
                &transport,
                demand.request,
            )
            .await;
            demand
                .response
                .send(result.map(|_| crate::sync::runtime::HydratedInputs::default()))
                .unwrap();
        }
    };
    tokio::time::timeout(std::time::Duration::from_secs(20), async {
        tokio::join!(reads, hydrate);
    })
    .await
    .unwrap();
}

#[tokio::test]
async fn concurrent_global_branch_creation_recovers_lost_merge_reply_and_cleans_pin() {
    run_concurrent_global_creation(false).await;
}
#[tokio::test]
async fn concurrent_global_branch_creation_settles_only_captured_prefix_before_merging_l2() {
    run_concurrent_global_creation(true).await;
}

#[tokio::test]
async fn lost_ordinary_creation_ack_then_later_global_advance_recovers_by_native_inclusion() {
    let backing = Memory::new();
    let authority = open_lix().with_storage(backing.clone()).await.unwrap();
    authority
        .set_sync_role(crate::sync::SyncRole::Authority)
        .unwrap();
    let server = open_lix()
        .with_storage(backing)
        .serve()
        .with_embedded_lix_id()
        .await
        .unwrap();
    let lost = Arc::new(AtomicBool::new(true));
    let transport = HttpSyncTransport::connect_with(
        GlobalClient {
            server,
            lose_merge: Arc::new(AtomicBool::new(false)),
            lose_ordinary: lost,
            lose_cleanup: Arc::new(AtomicBool::new(false)),
        },
        &format!("https://example.test/lix/{}", authority.lix_id()),
    )
    .await
    .unwrap();
    let (engine, session, base) = replica(&transport).await;
    let child = create_local(&session, &engine, &base, &transport, "lost-ordinary-child").await;
    let storage = engine.storage();
    let storage_ref = &storage;
    let state_ref = base.as_ref();
    let transport_ref = &transport;
    let error = crate::sync::partial_upload_cycle::upload_partial_once(
        &storage,
        &base,
        crate::GLOBAL_BRANCH_ID,
        uuid::Uuid::now_v7().to_string(),
        32,
        1024 * 1024,
        |request| async move {
            crate::sync::partial_blob_upload::push_partial_with_blobs(
                storage_ref,
                state_ref,
                transport_ref,
                &request,
            )
            .await
        },
    )
    .await
    .unwrap_err();
    assert_eq!(error.code, "TEST_LOST_ORDINARY_REPLY");
    crate::sync::admit_sync_authority_storage(&authority.storage_adapter(), None)
        .await
        .unwrap();
    authority
        .create_branch(crate::CreateBranchOptions {
            id: None,
            name: "later-authority-child".into(),
            from_commit_id: None,
        })
        .await
        .unwrap();
    let wrapper = transport.partial_replica_descriptor(None).await.unwrap();
    let remote_head = wrapper.wire.descriptor.global_branch.head.commit_id.clone();
    let result = crate::sync::partial_global_merge_runtime::prepare_descriptor_with_global_merge(
        engine.clone(),
        base.clone(),
        &transport,
        wrapper,
        crate::sync::partial_publication::PartialRecoveryPolicy::Normal,
    )
    .await
    .unwrap();
    let crate::sync::partial_reconcile::PreparedDescriptor::Ready(prepared) = result else {
        panic!("inclusion must prepare current authority descriptor")
    };
    crate::sync::partial_publication::publish_prepared_partial(engine.clone(), prepared)
        .await
        .unwrap();
    assert_eq!(
        transport
            .partial_replica_descriptor(None)
            .await
            .unwrap()
            .wire
            .descriptor
            .global_branch
            .head
            .commit_id,
        remote_head,
        "inclusion recovery must not manufacture a duplicate descriptor merge"
    );
    assert_eq!(
        transport
            .partial_replica_descriptor(Some(&child))
            .await
            .unwrap()
            .wire
            .descriptor
            .selected_branch
            .branch_id,
        child
    );
    let current = engine.sync_mode().partial_admission().unwrap();
    let read = storage.begin_read(Default::default()).await.unwrap();
    assert!(
        crate::sync::partial_global_merge_state::load_partial_global_merge_state(&read, &current)
            .await
            .unwrap()
            .0
            .is_none()
    );
    let (push, _, _) = crate::sync::partial_push_state::load_partial_push_state(
        &read,
        &current,
        crate::GLOBAL_BRANCH_ID,
    )
    .await
    .unwrap();
    assert!(push.prepared.is_none());
    assert_eq!(push.confirmed.head, remote_head);
}