refactor: rename gc snapshot to trimmed snapshot

crates/examples/examples/time_tracker.rs

@@ -52,8 +52,11 @@ pub fn main() {
  let snapshot = doc.export(loro::ExportMode::Snapshot);
  println!("Snapshot Size {}", ByteSize(snapshot.len()));
  println!("mem: {}", get_mem_usage());
- let gc_snapshot = doc.export(loro::ExportMode::gc_snapshot(&doc.oplog_frontiers()));
- println!("GC Shallow Snapshot Size {}", ByteSize(gc_snapshot.len()));
+ let trimmed_snapshot = doc.export(loro::ExportMode::trimmed_snapshot(&doc.oplog_frontiers()));
+ println!(
+ "GC Shallow Snapshot Size {}",
+ ByteSize(trimmed_snapshot.len())
+ );
  println!("mem: {}", get_mem_usage());
 
  examples::utils::bench_fast_snapshot(&doc);

crates/examples/src/utils.rs

@@ -85,7 +85,7 @@ pub fn bench_fast_snapshot(doc: &LoroDoc) {
  {
  println!("======== New snapshot mode with GC =========");
  let start = Instant::now();
- let snapshot = doc.export(loro::ExportMode::gc_snapshot(&doc.oplog_frontiers()));
+ let snapshot = doc.export(loro::ExportMode::trimmed_snapshot(&doc.oplog_frontiers()));
  let elapsed = start.elapsed();
  println!("Fast Snapshot size: {}", ByteSize(snapshot.len()));
  println!("Export fast snapshot time: {:?}", elapsed);

crates/fuzz/src/crdt_fuzzer.rs

@@ -364,7 +364,7 @@ pub fn test_multi_sites_with_gc(
  ensure_cov::notify_cov("fuzz_gc");
  let mut fuzzer = CRDTFuzzer::new(site_num, fuzz_targets);
  let mut applied = Vec::new();
- let target_gc_index = actions.len() / 2;
+ let target_trimmed_index = actions.len() / 2;
  for (i, action) in actions.iter_mut().enumerate() {
  fuzzer.pre_process(action);
  info_span!("ApplyAction", ?action).in_scope(|| {
@@ -374,15 +374,15 @@ pub fn test_multi_sites_with_gc(
  fuzzer.apply_action(action);
  });
 
- if i == target_gc_index {
+ if i == target_trimmed_index {
  info_span!("GC 1 => 0").in_scope(|| {
  fuzzer.actors[1].loro.attach();
  let f = fuzzer.actors[1].loro.oplog_frontiers();
  if !f.is_empty() {
- ensure_cov::notify_cov("export_gc_snapshot");
+ ensure_cov::notify_cov("export_trimmed_snapshot");
  let bytes = fuzzer.actors[1]
  .loro
- .export(loro::ExportMode::gc_snapshot(&f));
+ .export(loro::ExportMode::trimmed_snapshot(&f));
  fuzzer.actors[0].loro.import(&bytes).unwrap();
  }
  })
@@ -510,9 +510,9 @@ pub fn test_multi_sites_with_gc(
  if COUNT.fetch_add(1, std::sync::atomic::Ordering::Relaxed) % 1_000 == 0 {
  let must_meet = [
  "fuzz_gc",
- "export_gc_snapshot",
- "gc_snapshot::need_calc",
- "gc_snapshot::dont_need_calc",
+ "export_trimmed_snapshot",
+ "trimmed_snapshot::need_calc",
+ "trimmed_snapshot::dont_need_calc",
  "loro_internal::history_cache::find_text_chunks_in",
  "loro_internal::history_cache::find_list_chunks_in",
  "loro_internal::import",

crates/fuzz/tests/test.rs

@@ -9410,7 +9410,7 @@ fn fast_snapshot_5() {
 }
 
 #[test]
-fn gc_fuzz() {
+fn trimmed_fuzz() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9431,7 +9431,7 @@ fn gc_fuzz() {
 }
 
 #[test]
-fn gc_fuzz_1() {
+fn trimmed_fuzz_1() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9455,7 +9455,7 @@ fn gc_fuzz_1() {
 }
 
 #[test]
-fn gc_fuzz_2() {
+fn trimmed_fuzz_2() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9479,7 +9479,7 @@ fn gc_fuzz_2() {
 }
 
 #[test]
-fn gc_fuzz_3() {
+fn trimmed_fuzz_3() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9492,7 +9492,7 @@ fn gc_fuzz_3() {
 }
 
 #[test]
-fn gc_fuzz_4() {
+fn trimmed_fuzz_4() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9531,7 +9531,7 @@ fn gc_fuzz_4() {
 }
 
 #[test]
-fn gc_fuzz_5() {
+fn trimmed_fuzz_5() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9556,7 +9556,7 @@ fn gc_fuzz_5() {
 }
 
 #[test]
-fn gc_fuzz_6() {
+fn trimmed_fuzz_6() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9606,7 +9606,7 @@ fn gc_fuzz_6() {
 }
 
 #[test]
-fn gc_fuzz_8() {
+fn trimmed_fuzz_8() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9656,7 +9656,7 @@ fn gc_fuzz_8() {
 }
 
 #[test]
-fn gc_fuzz_7() {
+fn trimmed_fuzz_7() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9680,7 +9680,7 @@ fn gc_fuzz_7() {
 }
 
 #[test]
-fn gc_fuzz_9() {
+fn trimmed_fuzz_9() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9738,7 +9738,7 @@ fn gc_fuzz_9() {
 }
 
 #[test]
-fn gc_fuzz_10() {
+fn trimmed_fuzz_10() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9792,7 +9792,7 @@ fn gc_fuzz_10() {
 }
 
 #[test]
-fn gc_arb_test() {
+fn trimmed_arb_test() {
  fn prop(u: &mut Unstructured<'_>, site_num: u8) -> arbitrary::Result<()> {
  let xs = u.arbitrary::<Vec<Action>>()?;
  if let Err(e) = std::panic::catch_unwind(|| {
@@ -9810,7 +9810,7 @@ fn gc_arb_test() {
 }
 
 #[test]
-fn gc_fuzz_11() {
+fn trimmed_fuzz_11() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9878,7 +9878,7 @@ fn gc_fuzz_11() {
 }
 
 #[test]
-fn gc_fuzz_12() {
+fn trimmed_fuzz_12() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -9945,7 +9945,7 @@ fn gc_fuzz_12() {
 }
 
 #[test]
-fn gc_fuzz_13() {
+fn trimmed_fuzz_13() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10004,7 +10004,7 @@ fn gc_fuzz_13() {
 }
 
 #[test]
-fn gc_fuzz_14() {
+fn trimmed_fuzz_14() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10053,7 +10053,7 @@ fn gc_fuzz_14() {
 }
 
 #[test]
-fn gc_fuzz_15() {
+fn trimmed_fuzz_15() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10130,7 +10130,7 @@ fn gc_fuzz_15() {
 }
 
 #[test]
-fn gc_fuzz_16() {
+fn trimmed_fuzz_16() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10193,7 +10193,7 @@ fn gc_fuzz_16() {
 }
 
 #[test]
-fn gc_fuzz_17() {
+fn trimmed_fuzz_17() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10273,7 +10273,7 @@ fn gc_fuzz_17() {
 }
 
 #[test]
-fn gc_fuzz_18() {
+fn trimmed_fuzz_18() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10367,7 +10367,7 @@ fn gc_fuzz_18() {
 }
 
 #[test]
-fn gc_fuzz_19() {
+fn trimmed_fuzz_19() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10568,7 +10568,7 @@ fn gc_fuzz_19() {
 }
 
 #[test]
-fn gc_fuzz_20() {
+fn trimmed_fuzz_20() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10791,7 +10791,7 @@ fn gc_fuzz_20() {
 }
 
 #[test]
-fn gc_fuzz_21() {
+fn trimmed_fuzz_21() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -10955,7 +10955,7 @@ fn gc_fuzz_21() {
 }
 
 #[test]
-fn gc_fuzz_22() {
+fn trimmed_fuzz_22() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -11049,7 +11049,7 @@ fn gc_fuzz_22() {
 }
 
 #[test]
-fn gc_fuzz_24() {
+fn trimmed_fuzz_24() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -11255,7 +11255,7 @@ fn detached_editing_failed_case_0() {
 }
 
 #[test]
-fn gc_fuzz_23() {
+fn trimmed_fuzz_23() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -11373,7 +11373,7 @@ fn gc_fuzz_23() {
 }
 
 #[test]
-fn gc_fuzz_25() {
+fn trimmed_fuzz_25() {
  test_multi_sites_with_gc(
  5,
  vec![FuzzTarget::All],
@@ -11409,7 +11409,7 @@ fn gc_fuzz_25() {
 }
 
 #[test]
-fn gc_fuzz_unknown() {
+fn trimmed_fuzz_unknown() {
  test_multi_sites(
  5,
  vec![FuzzTarget::All],

crates/loro-ffi/src/doc.rs

@@ -490,9 +490,11 @@ impl LoroDoc {
  })
  }
 
- pub fn export_gc_snapshot(&self, frontiers: &Frontiers) -> Vec<u8> {
+ pub fn export_trimmed_snapshot(&self, frontiers: &Frontiers) -> Vec<u8> {
  self.doc
- .export(loro::ExportMode::GcSnapshot(Cow::Owned(frontiers.into())))
+ .export(loro::ExportMode::TrimmedSnapshot(Cow::Owned(
+ frontiers.into(),
+ )))
  }
 
  pub fn export_state_only(&self, frontiers: Option<Arc<Frontiers>>) -> Vec<u8> {
@@ -703,7 +705,7 @@ pub enum ExportMode {
  Snapshot,
  Updates { from: VersionVector },
  UpdatesInRange { spans: Vec<IdSpan> },
- GcSnapshot { frontiers: Frontiers },
+ TrimmedSnapshot { frontiers: Frontiers },
  StateOnly { frontiers: Option<Frontiers> },
 }
 
@@ -717,8 +719,8 @@ impl From<ExportMode> for loro::ExportMode<'_> {
  ExportMode::UpdatesInRange { spans } => loro::ExportMode::UpdatesInRange {
  spans: Cow::Owned(spans),
  },
- ExportMode::GcSnapshot { frontiers } => {
- loro::ExportMode::GcSnapshot(Cow::Owned(frontiers.into()))
+ ExportMode::TrimmedSnapshot { frontiers } => {
+ loro::ExportMode::TrimmedSnapshot(Cow::Owned(frontiers.into()))
  }
  ExportMode::StateOnly { frontiers } => {
  loro::ExportMode::StateOnly(frontiers.map(|x| Cow::Owned(x.into())))