fst_incremental 1.0.2

A thread-safe, updatable finite state set: dynamic insertions, deletions and queries over an immutable fst::Set fronted by a compact mutation buffer with amortized rebuilds.
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
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
use crate::arena::CompactArenaSet;
use crate::error::{IncrementalFstError, Result};
use crate::inner::{FstDataSource, IncrementalFstSetInner, RebuildOutcome};
use crate::metrics::FstMetricsSnapshot;
use crate::stream::{self, MergedSetStreamOwner};
use crate::types::{FstChangeType, FstConfigOptions, FstMutationResult, SerializableFstBuffers};

use fst::{Automaton, IntoStreamer, Set, Streamer};
use memmap2::MmapOptions;
use parking_lot::RwLock;
use std::collections::BTreeSet;
use std::fs::File;
use std::io::Cursor;
use std::path::Path;
use std::sync::Arc;
use std::time::Duration;

/// A thread-safe set of byte strings that supports insertion and removal.
///
/// Backed by an immutable [`fst::Set`] fronted by an in-memory mutation buffer. Reads
/// consult both, so queries always see the current logical state; the buffer is folded
/// back into a fresh FST when a rebuild threshold trips.
///
/// This type never touches the filesystem on its own behalf. Persisting is the caller's
/// job: see [`persisted_fst_as_bytes`](Self::persisted_fst_as_bytes) and
/// [`buffers_snapshot`](Self::buffers_snapshot).
pub struct IncrementalFstSet {
  inner: RwLock<IncrementalFstSetInner>,
}

impl IncrementalFstSet {
  fn resolve_config_options_and_buffers(
    options: Option<FstConfigOptions>,
  ) -> (usize, f32, Option<Duration>, CompactArenaSet) {
    let opts = options.unwrap_or_default();

    let adds_count = opts
      .rebuild_threshold_adds_count
      .unwrap_or(FstConfigOptions::DEFAULT_REBUILD_ADDS_COUNT);
    let dels_ratio = opts
      .rebuild_threshold_dels_ratio
      .unwrap_or(FstConfigOptions::DEFAULT_REBUILD_DELS_RATIO);
    let interval = opts.min_rebuild_interval_ms.map(Duration::from_millis);

    let mutation_buffer = opts.initial_mutation_buffer.unwrap_or_default();

    (adds_count, dels_ratio, interval, mutation_buffer)
  }

  /// Creates an empty set.
  pub fn new(options: Option<FstConfigOptions>) -> Result<Self> {
    let (rebuild_adds, rebuild_dels_ratio, min_interval, initial_buf) =
      Self::resolve_config_options_and_buffers(options);

    let mut empty_data_writer = Vec::new();
    let mut cursor = Cursor::new(&mut empty_data_writer);
    let builder = fst::SetBuilder::new(&mut cursor)?;
    builder.finish()?;
    let empty_fst_data_source = FstDataSource::new_from_vec(Arc::new(empty_data_writer));

    Ok(Self {
      inner: RwLock::new(IncrementalFstSetInner::new(
        empty_fst_data_source,
        initial_buf,
        true,
        rebuild_adds,
        rebuild_dels_ratio,
        min_interval,
      )?),
    })
  }

  /// Opens a set whose FST is memory-mapped from `mmap_path`.
  ///
  /// The file must hold FST bytes as written by [`persisted_fst_as_bytes`](Self::persisted_fst_as_bytes).
  /// It is mapped, not copied, so it must not be modified while the set is alive.
  pub fn from_persisted_mmap(mmap_path: &Path, options: Option<FstConfigOptions>) -> Result<Self> {
    let (rebuild_adds, rebuild_dels_ratio, min_interval, initial_buf) =
      Self::resolve_config_options_and_buffers(options);

    let fst_file = File::open(mmap_path).map_err(IncrementalFstError::Io)?;
    let mmap = unsafe { MmapOptions::new().map(&fst_file).map_err(IncrementalFstError::Io)? };
    let fst_data_source = FstDataSource::new_from_mmap(mmap);

    Ok(Self {
      inner: RwLock::new(IncrementalFstSetInner::new(
        fst_data_source,
        initial_buf,
        false,
        rebuild_adds,
        rebuild_dels_ratio,
        min_interval,
      )?),
    })
  }

  /// Opens a set from FST bytes held in memory. `None` starts empty.
  pub fn from_data(fst_bytes: Option<Vec<u8>>, options: Option<FstConfigOptions>) -> Result<Self> {
    let (rebuild_adds, rebuild_dels_ratio, min_interval, initial_buf) =
      Self::resolve_config_options_and_buffers(options);

    let is_empty_init_flag;
    let fst_data_source = match fst_bytes {
      Some(bytes) => {
        is_empty_init_flag = Set::new(&bytes)?.is_empty();
        FstDataSource::new_from_vec(Arc::new(bytes))
      }
      None => {
        let mut empty_data_writer = Vec::new();
        let mut cursor = Cursor::new(&mut empty_data_writer);
        let builder = fst::SetBuilder::new(&mut cursor)?;
        builder.finish()?;
        is_empty_init_flag = true;
        FstDataSource::new_from_vec(Arc::new(empty_data_writer))
      }
    };

    Ok(Self {
      inner: RwLock::new(IncrementalFstSetInner::new(
        fst_data_source,
        initial_buf,
        is_empty_init_flag,
        rebuild_adds,
        rebuild_dels_ratio,
        min_interval,
      )?),
    })
  }

  /// Reads the cumulative rebuild counters.
  pub fn get_metrics(&self) -> Result<FstMetricsSnapshot> {
    Ok(self.inner.read().metrics.snapshot())
  }

  /// Copies out the persisted FST bytes, ready to be written to a file.
  ///
  /// This does not include the mutation buffer; take [`buffers_snapshot`](Self::buffers_snapshot)
  /// as well, or call [`force_rebuild`](Self::force_rebuild) first to fold the buffer in.
  pub fn persisted_fst_as_bytes(&self) -> Vec<u8> {
    self.inner.read().persisted_fst_data_arc.as_ref().to_vec()
  }

  /// Copies out the pending mutations not yet folded into the persisted FST.
  pub fn buffers_snapshot(&self) -> SerializableFstBuffers {
    let inner = self.inner.read();
    SerializableFstBuffers::new(inner.mutation_buffer.clone())
  }

  /// Adds a key, resurrecting it if it was tombstoned.
  ///
  /// May trigger a rebuild, in which case the result reports [`FstChangeType::FstRebuilt`].
  pub fn insert(&self, key: Vec<u8>) -> Result<FstMutationResult> {
    let mut inner = self.inner.write();

    if inner.mutation_buffer.insert(&key) {
      inner.add_buffer_changed_since_last_cache = true;

      if !inner.rebuild_pending_due_to_interval {
        let rebuild_outcome = IncrementalFstSetInner::check_and_trigger_rebuild(&mut inner, false)?;
        match rebuild_outcome {
          RebuildOutcome::Rebuilt => {
            return Ok(FstMutationResult {
              change_type: FstChangeType::FstRebuilt,
            });
          }
          RebuildOutcome::RebuildDeferred => {
            return Ok(FstMutationResult {
              change_type: FstChangeType::BuffersModified,
            });
          }
          RebuildOutcome::NotNeeded => {
            return Ok(FstMutationResult {
              change_type: FstChangeType::BuffersModified,
            });
          }
        }
      }
      return Ok(FstMutationResult {
        change_type: FstChangeType::BuffersModified,
      });
    }

    Ok(FstMutationResult {
      change_type: FstChangeType::NoChange,
    })
  }

  /// Removes a key.
  ///
  /// A key present only in the persisted FST is tombstoned rather than erased; the
  /// tombstone is resolved at the next rebuild.
  pub fn remove(&self, key: &[u8]) -> Result<FstMutationResult> {
    let mut inner = self.inner.write();

    if inner.mutation_buffer.remove(key) {
      inner.add_buffer_changed_since_last_cache = true;

      let rebuild_outcome = IncrementalFstSetInner::check_and_trigger_rebuild(&mut inner, false)?;
      match rebuild_outcome {
        RebuildOutcome::Rebuilt => {
          return Ok(FstMutationResult {
            change_type: FstChangeType::FstRebuilt,
          });
        }
        RebuildOutcome::RebuildDeferred | RebuildOutcome::NotNeeded => {
          return Ok(FstMutationResult {
            change_type: FstChangeType::BuffersModified,
          });
        }
      }
    }

    Ok(FstMutationResult {
      change_type: FstChangeType::NoChange,
    })
  }

  /// Adds many keys under a single write lock.
  ///
  /// Never rebuilds on its own. Call
  /// [`finish_bulk_operations_and_rebuild_if_needed`](Self::finish_bulk_operations_and_rebuild_if_needed)
  /// afterwards to fold the buffer in.
  pub fn bulk_insert<I>(&self, iter: I) -> Result<FstMutationResult>
  where
    I: IntoIterator<Item = Vec<u8>>,
  {
    let mut inner = self.inner.write();
    let mut changed = false;
    for key in iter {
      if inner.mutation_buffer.insert(&key) {
        changed = true;
      }
    }
    if changed {
      inner.add_buffer_changed_since_last_cache = true;
      Ok(FstMutationResult {
        change_type: FstChangeType::BuffersModified,
      })
    } else {
      Ok(FstMutationResult {
        change_type: FstChangeType::NoChange,
      })
    }
  }

  /// Ends a bulk sequence, rebuilding if anything is pending.
  pub fn finish_bulk_operations_and_rebuild_if_needed(&self) -> Result<FstMutationResult> {
    let mut inner = self.inner.write();

    // Check if there is ANY data in the unified buffer (alive items OR tombstones).
    // If len_raw() > 0, there is pending work that *could* be flushed to disk,
    // even if they are just tombstones that haven't met the threshold yet.
    let buffer_has_data = inner.mutation_buffer.len_raw() > 0;
    let initial_pending_rebuild = inner.rebuild_pending_due_to_interval;

    let should_attempt_rebuild =
      inner.add_buffer_changed_since_last_cache || buffer_has_data || initial_pending_rebuild;

    if should_attempt_rebuild {
      let rebuild_outcome = IncrementalFstSetInner::check_and_trigger_rebuild(&mut inner, false)?;
      match rebuild_outcome {
        RebuildOutcome::Rebuilt => Ok(FstMutationResult {
          change_type: FstChangeType::FstRebuilt,
        }),
        RebuildOutcome::RebuildDeferred => Ok(FstMutationResult {
          change_type: FstChangeType::BuffersModified,
        }),
        RebuildOutcome::NotNeeded => {
          if inner.add_buffer_changed_since_last_cache || buffer_has_data {
            Ok(FstMutationResult {
              change_type: FstChangeType::BuffersModified,
            })
          } else {
            Ok(FstMutationResult {
              change_type: FstChangeType::NoChange,
            })
          }
        }
      }
    } else {
      Ok(FstMutationResult {
        change_type: FstChangeType::NoChange,
      })
    }
  }

  /// Rebuilds now, ignoring the configured thresholds.
  ///
  /// A minimum rebuild interval still applies: inside the window this defers and reports
  /// [`FstChangeType::BuffersModified`].
  pub fn force_rebuild(&self) -> Result<FstMutationResult> {
    let mut inner = self.inner.write();
    let outcome = IncrementalFstSetInner::check_and_trigger_rebuild(&mut inner, true)?;
    match outcome {
      RebuildOutcome::Rebuilt => Ok(FstMutationResult {
        change_type: FstChangeType::FstRebuilt,
      }),
      RebuildOutcome::RebuildDeferred => Ok(FstMutationResult {
        change_type: FstChangeType::BuffersModified,
      }),
      RebuildOutcome::NotNeeded => Ok(FstMutationResult {
        change_type: FstChangeType::NoChange,
      }),
    }
  }

  /// Counts the live keys.
  ///
  /// Walks the merged stream, so this is O(n) rather than a stored count.
  pub fn len(&self) -> Result<usize> {
    let mut s = self.stream()?;
    let mut count = 0;
    while s.next().is_some() {
      count += 1;
    }
    Ok(count)
  }

  /// Reports whether `key` is currently in the set.
  pub fn contains(&self, key: &[u8]) -> Result<bool> {
    let inner = self.inner.read();

    match inner.mutation_buffer.get_status(key) {
      Some(true) => Ok(true),
      Some(false) => Ok(false),
      None => {
        let persisted_set = inner.get_persisted_set()?;
        Ok(persisted_set.contains(key))
      }
    }
  }

  /// Streams every live key in lexicographic order.
  ///
  /// The returned stream holds a read lock until it is dropped.
  pub fn stream(&self) -> Result<MergedSetStreamOwner<'_>> {
    let guard = self.inner.read();
    stream::new_merged_set_stream_owner(guard)
  }

  /// Reports whether the set holds no live keys.
  pub fn is_empty(&self) -> Result<bool> {
    let mut s = self.stream()?;
    Ok(s.next().is_none())
  }

  /// Collects every live key matching `aut`.
  ///
  /// Results are materialized into a `Vec` rather than streamed, because matches from the
  /// persisted FST and the buffer have to be merged before they can be ordered.
  pub fn search<A: Automaton + Clone>(&self, aut: A) -> Result<Vec<Vec<u8>>> {
    let mut inner_guard = self.inner.write();
    let cloned_overlay_fst_opt: Option<Set<FstDataSource>> = inner_guard.get_mutation_overlay_fst()?.cloned();
    let persisted_s_ref = inner_guard.get_persisted_set()?;

    let mut results_set = BTreeSet::new();

    let mut persisted_stream = persisted_s_ref.search(aut.clone()).into_stream();
    while let Some(key_slice) = persisted_stream.next() {
      if inner_guard.mutation_buffer.get_status(key_slice) != Some(false) {
        results_set.insert(key_slice.to_vec());
      }
    }

    if let Some(overlay_fst) = &cloned_overlay_fst_opt {
      let mut overlay_stream = overlay_fst.search(aut).into_stream();
      while let Some(key_slice) = overlay_stream.next() {
        results_set.insert(key_slice.to_vec());
      }
    }
    Ok(results_set.into_iter().collect())
  }
}

#[cfg(test)]
mod tests {
  use super::*;
  use fst::automaton::Str;
  use fst::set::OpBuilder as FstSetOpBuilder;
  use std::sync::atomic::Ordering as AtomicOrdering;
  use std::thread;

  #[cfg(feature = "serde")]
  use crate::arena::CompactArenaSet;
  #[cfg(feature = "serde")]
  use std::fs;

  #[cfg(feature = "serde")]
  fn temp_dir() -> tempfile::TempDir {
    tempfile::Builder::new().prefix("inc_fst_test_").tempdir().unwrap()
  }

  fn new_test_set_with_options(options: Option<FstConfigOptions>) -> Result<IncrementalFstSet> {
    IncrementalFstSet::new(options)
  }

  fn new_test_set(adds: usize, dels_ratio: f32, interval_ms: Option<u64>) -> Result<IncrementalFstSet> {
    let mut opts_builder = FstConfigOptions::new()
      .with_rebuild_adds_count(adds)
      .with_rebuild_dels_ratio(dels_ratio);
    if let Some(ms) = interval_ms {
      opts_builder = opts_builder.with_min_rebuild_interval_ms(ms);
    }
    IncrementalFstSet::new(Some(opts_builder))
  }

  #[test]
  fn test_insert_and_remove_outcomes() -> Result<()> {
    // Use 1.1 ratio to prevent auto-rebuild completely during manual ops
    let config = FstConfigOptions::new()
      .with_rebuild_adds_count(3)
      .with_rebuild_dels_ratio(1.1);

    let set = new_test_set_with_options(Some(config))?;

    let res1 = set.insert(b"apple".to_vec())?;
    assert_eq!(res1.change_type, FstChangeType::BuffersModified);

    let res2 = set.insert(b"banana".to_vec())?;
    assert_eq!(res2.change_type, FstChangeType::BuffersModified);

    let res3 = set.insert(b"orange".to_vec())?;
    assert_eq!(res3.change_type, FstChangeType::FstRebuilt);

    let buffers_after_rebuild = set.buffers_snapshot();
    assert!(buffers_after_rebuild.mutation_buffer().is_empty());

    let res4 = set.insert(b"apple".to_vec())?;
    assert_eq!(res4.change_type, FstChangeType::BuffersModified);
    assert!(set.buffers_snapshot().mutation_buffer().contains(b"apple".as_ref()));

    let res5 = set.remove(b"apple")?;
    assert_eq!(res5.change_type, FstChangeType::BuffersModified);
    assert!(!set.buffers_snapshot().mutation_buffer().contains(b"apple".as_ref()));
    assert!(set.buffers_snapshot().mutation_buffer().len_raw() > 0);

    let res6 = set.remove(b"banana")?;
    assert_eq!(res6.change_type, FstChangeType::BuffersModified);
    assert!(!set.buffers_snapshot().mutation_buffer().contains(b"banana".as_ref()));

    // This adds a tombstone, but because ratio is 1.1, no rebuild triggers.
    let res7 = set.remove(b"grape")?;
    assert_eq!(res7.change_type, FstChangeType::BuffersModified);

    let res_force = set.force_rebuild()?;
    assert_eq!(res_force.change_type, FstChangeType::FstRebuilt);

    assert!(!set.contains(b"banana")?);
    assert!(set.contains(b"orange")?);
    assert!(set.buffers_snapshot().mutation_buffer().is_empty());

    Ok(())
  }

  #[test]
  fn test_fst_config_options() -> Result<()> {
    let set_default = IncrementalFstSet::new(None)?;
    let inner_default = set_default.inner.read();
    assert_eq!(
      inner_default.rebuild_threshold_adds_count,
      FstConfigOptions::DEFAULT_REBUILD_ADDS_COUNT
    );
    assert_eq!(
      inner_default.rebuild_threshold_dels_ratio,
      FstConfigOptions::DEFAULT_REBUILD_DELS_RATIO
    );
    assert_eq!(inner_default.min_rebuild_interval, None);
    drop(inner_default);

    let custom_adds = 555;
    let custom_ratio = 0.77f32;
    let custom_interval_ms = 12345u64;
    let options = FstConfigOptions::new()
      .with_rebuild_adds_count(custom_adds)
      .with_rebuild_dels_ratio(custom_ratio)
      .with_min_rebuild_interval_ms(custom_interval_ms);
    let set_custom = IncrementalFstSet::new(Some(options))?;
    let inner_custom = set_custom.inner.read();
    assert_eq!(inner_custom.rebuild_threshold_adds_count, custom_adds);
    assert_eq!(inner_custom.rebuild_threshold_dels_ratio, custom_ratio);
    assert_eq!(
      inner_custom.min_rebuild_interval,
      Some(Duration::from_millis(custom_interval_ms))
    );
    drop(inner_custom);

    Ok(())
  }

  #[test]
  #[cfg(feature = "serde")]
  fn test_caller_persistence_from_data() -> Result<()> {
    let dir = temp_dir();
    let fst_file_path_v1 = dir.path().join("data_v1.fst");
    let buffers_file_path_v1 = dir.path().join("buffers_v1.rmp");
    let fst_file_path_v2 = dir.path().join("data_v2.fst");
    let buffers_file_path_v2 = dir.path().join("buffers_v2.rmp");

    let opts_for_set = FstConfigOptions::new().with_rebuild_adds_count(2);
    let set = IncrementalFstSet::new(Some(opts_for_set.clone()))?;

    let res_insert1 = set.insert(b"apple".to_vec())?;
    assert_eq!(res_insert1.change_type, FstChangeType::BuffersModified);

    let fst_bytes_v1 = set.persisted_fst_as_bytes();
    fs::write(&fst_file_path_v1, &fst_bytes_v1).unwrap();
    let buffers_v1_snapshot = set.buffers_snapshot();
    let serialized_buffers_v1 = rmp_serde::to_vec_named(&buffers_v1_snapshot).unwrap();
    fs::write(&buffers_file_path_v1, &serialized_buffers_v1).unwrap();

    let res_insert2 = set.insert(b"banana".to_vec())?; // Rebuild threshold is 2
    assert_eq!(res_insert2.change_type, FstChangeType::FstRebuilt);

    let fst_bytes_v2 = set.persisted_fst_as_bytes();
    fs::write(&fst_file_path_v2, &fst_bytes_v2).unwrap();
    let buffers_v2_snapshot = set.buffers_snapshot();
    let serialized_buffers_v2 = rmp_serde::to_vec_named(&buffers_v2_snapshot).unwrap();
    fs::write(&buffers_file_path_v2, &serialized_buffers_v2).unwrap();

    let loaded_fst_bytes_v1_from_file = fs::read(&fst_file_path_v1).unwrap();
    let loaded_serialized_buffers_v1_from_file = fs::read(&buffers_file_path_v1).unwrap();
    let loaded_buffers_struct_v1: SerializableFstBuffers =
      rmp_serde::from_slice(&loaded_serialized_buffers_v1_from_file).unwrap();

    let options_for_load_v1 = FstConfigOptions::new()
      .with_rebuild_adds_count(2)
      .with_initial_buffer(loaded_buffers_struct_v1.into_mutation_buffer());
    let set_v1_loaded = IncrementalFstSet::from_data(Some(loaded_fst_bytes_v1_from_file), Some(options_for_load_v1))?;

    assert!(set_v1_loaded.contains(b"apple")?);
    assert!(!set_v1_loaded.contains(b"banana")?);
    assert_eq!(set_v1_loaded.buffers_snapshot().mutation_buffer().len(), 1);
    assert!(
      set_v1_loaded
        .buffers_snapshot()
        .mutation_buffer()
        .contains(b"apple".as_ref())
    );

    let loaded_fst_bytes_v2_from_file = fs::read(&fst_file_path_v2).unwrap();
    let loaded_serialized_buffers_v2_from_file = fs::read(&buffers_file_path_v2).unwrap();
    let loaded_buffers_struct_v2: SerializableFstBuffers =
      rmp_serde::from_slice(&loaded_serialized_buffers_v2_from_file).unwrap();

    let options_for_load_v2 = FstConfigOptions::new()
      .with_rebuild_adds_count(2)
      .with_initial_buffer(loaded_buffers_struct_v2.into_mutation_buffer());
    let set_v2_loaded = IncrementalFstSet::from_data(Some(loaded_fst_bytes_v2_from_file), Some(options_for_load_v2))?;

    assert!(set_v2_loaded.contains(b"apple")?);
    assert!(set_v2_loaded.contains(b"banana")?);
    assert!(set_v2_loaded.buffers_snapshot().mutation_buffer().is_empty());
    assert_eq!(set_v2_loaded.persisted_fst_as_bytes(), fst_bytes_v2.as_slice());

    let mutation_buf_only: CompactArenaSet = vec![b"only_add"].into_iter().collect();
    let opts_buf_only = FstConfigOptions::new().with_initial_buffer(mutation_buf_only.clone());
    let set_buf_only = IncrementalFstSet::from_data(None, Some(opts_buf_only))?;
    assert!(
      set_buf_only.persisted_fst_as_bytes().is_empty() || Set::new(set_buf_only.persisted_fst_as_bytes())?.is_empty()
    );
    assert_eq!(set_buf_only.buffers_snapshot().mutation_buffer(), &mutation_buf_only);
    assert!(set_buf_only.contains(b"only_add")?);

    Ok(())
  }

  #[test]
  #[cfg(feature = "serde")]
  fn test_caller_persistence_from_mmap() -> Result<()> {
    let dir = temp_dir();
    let fst_file_path = dir.path().join("mmap_test.fst");
    let buffers_file_path = dir.path().join("mmap_buffers.rmp");

    // Use 1.0 delete ratio to avoid early rebuilds during setup
    let initial_opts = FstConfigOptions::new()
      .with_rebuild_adds_count(5)
      .with_rebuild_dels_ratio(1.0);

    let setup_set = IncrementalFstSet::new(Some(initial_opts.clone()))?;
    setup_set.insert(b"mmap_apple".to_vec())?;
    setup_set.insert(b"mmap_banana".to_vec())?;
    setup_set.force_rebuild()?;

    setup_set.insert(b"mmap_cherry".to_vec())?;
    setup_set.remove(b"mmap_apple".as_ref())?;

    let fst_bytes_to_write = setup_set.persisted_fst_as_bytes();
    fs::write(&fst_file_path, &fst_bytes_to_write).unwrap();
    let buffers_to_write = setup_set.buffers_snapshot();
    let serialized_buffers = rmp_serde::to_vec_named(&buffers_to_write).unwrap();
    fs::write(&buffers_file_path, &serialized_buffers).unwrap();

    let loaded_serialized_buffers = fs::read(&buffers_file_path).unwrap();
    let loaded_buffers_struct: SerializableFstBuffers = rmp_serde::from_slice(&loaded_serialized_buffers).unwrap();

    let load_options = FstConfigOptions::new()
      .with_rebuild_adds_count(5)
      .with_initial_buffer(loaded_buffers_struct.into_mutation_buffer());

    let loaded_set = IncrementalFstSet::from_persisted_mmap(&fst_file_path, Some(load_options))?;

    assert!(!loaded_set.contains(b"mmap_apple")?, "mmap_apple should be deleted");
    assert!(
      loaded_set.contains(b"mmap_banana")?,
      "mmap_banana should be in persisted FST"
    );
    assert!(
      loaded_set.contains(b"mmap_cherry")?,
      "mmap_cherry should be in loaded buffer"
    );

    let loaded_buffer = loaded_set.buffers_snapshot().into_mutation_buffer();
    assert!(loaded_buffer.contains(b"mmap_cherry".as_ref()));
    // apple is a tombstone, so contains returns false
    assert!(!loaded_buffer.contains(b"mmap_apple".as_ref()));
    // But it is present in raw length (cherry + apple_tombstone = 2)
    assert_eq!(loaded_buffer.len_raw(), 2);

    let mmap_fst_bytes = loaded_set.persisted_fst_as_bytes();
    assert_eq!(mmap_fst_bytes, fst_bytes_to_write.as_slice());

    Ok(())
  }

  #[test]
  fn test_getters() -> Result<()> {
    let set = new_test_set(2, 1.0, None)?; // Rebuild on 2 adds

    assert!(set.persisted_fst_as_bytes().is_empty() || Set::new(set.persisted_fst_as_bytes())?.is_empty());
    let snap0 = set.buffers_snapshot();
    assert!(snap0.mutation_buffer().is_empty());

    set.insert(b"key1".to_vec())?;
    assert!(set.persisted_fst_as_bytes().is_empty() || Set::new(set.persisted_fst_as_bytes())?.is_empty());
    let snap1 = set.buffers_snapshot();
    assert!(snap1.mutation_buffer().contains(b"key1".as_ref()));
    assert_eq!(snap1.mutation_buffer().len(), 1);

    set.insert(b"key2".to_vec())?;
    let fst_bytes_after_rebuild = set.persisted_fst_as_bytes();
    let rebuilt_fst = Set::new(fst_bytes_after_rebuild)?;
    assert!(rebuilt_fst.contains(b"key1"));
    assert!(rebuilt_fst.contains(b"key2"));
    let snap2 = set.buffers_snapshot();
    assert!(snap2.mutation_buffer().is_empty());

    set.remove(b"key1")?;
    let snap3 = set.buffers_snapshot();
    // It is a tombstone, so contains is false
    assert!(!snap3.mutation_buffer().contains(b"key1".as_ref()));
    // But it is tracked
    assert_eq!(snap3.mutation_buffer().len_raw(), 1);

    Ok(())
  }

  #[test]
  fn test_true_streaming_merged_set_stream() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    let _ = ufst.insert(b"b".to_vec())?;
    let _ = ufst.insert(b"d".to_vec())?;
    let _ = ufst.force_rebuild()?;

    let _ = ufst.insert(b"a".to_vec())?;
    let _ = ufst.insert(b"c".to_vec())?;
    let _ = ufst.insert(b"d".to_vec())?;
    let _ = ufst.remove(b"b")?;

    let mut stream_owner = ufst.stream()?;
    assert_eq!(stream_owner.next(), Some(b"a".to_vec()));
    assert_eq!(stream_owner.next(), Some(b"c".to_vec()));
    assert_eq!(stream_owner.next(), Some(b"d".to_vec()));
    assert_eq!(stream_owner.next(), None);
    Ok(())
  }

  #[test]
  fn test_thread_safety_and_metrics() -> Result<()> {
    let ufst_arc = Arc::new(new_test_set(2, 0.3, Some(10))?);
    let mut handles = vec![];
    for i in 0..20 {
      let ufst_clone = ufst_arc.clone();
      handles.push(thread::spawn(move || {
        let key_str = format!("key{:02}", i);
        let _ = ufst_clone.insert(key_str.into_bytes()).unwrap();
        if i % 3 == 0 && i > 0 {
          let key_to_remove = format!("key{:02}", i - 1);
          let _ = ufst_clone.remove(key_to_remove.as_bytes());
        }
        if i % 5 == 0 {
          let _ = ufst_clone.search(Str::new("key").starts_with()).unwrap();
        }
        let _ = ufst_clone.contains(format!("key{:02}", i).as_bytes()).unwrap_or(false);
      }));
    }
    for _i in 0..5 {
      let ufst_clone = ufst_arc.clone();
      handles.push(thread::spawn(move || {
        thread::sleep(Duration::from_millis(5));
        if let Ok(mut stream_owner) = ufst_clone.stream() {
          while stream_owner.next().is_some() { /* count */ }
        }
      }));
    }
    for handle in handles {
      handle.join().expect("Thread panicked");
    }
    let _ = ufst_arc.force_rebuild()?;
    let metrics = ufst_arc.get_metrics()?;
    assert!(metrics.num_rebuilds > 0);
    assert!(ufst_arc.len()? > 0);
    Ok(())
  }

  #[test]
  fn test_op_facade_via_snapshot() -> Result<()> {
    let ufst1 = new_test_set(5, 0.5, None)?;
    let _ = ufst1.insert(b"a".to_vec())?;
    let _ = ufst1.insert(b"b".to_vec())?;
    let _ = ufst1.insert(b"c".to_vec())?;

    let force_rebuild_result = ufst1.force_rebuild()?;
    assert_eq!(force_rebuild_result.change_type, FstChangeType::FstRebuilt);

    let persisted_fst1_bytes = ufst1.persisted_fst_as_bytes();

    let set_from_ufst1 = Set::new(persisted_fst1_bytes)?;

    let fst2_data_vec: Vec<u8> = {
      let mut write_buf = Vec::new();
      let mut cursor = Cursor::new(&mut write_buf);
      let mut builder = fst::SetBuilder::new(&mut cursor)?;
      builder.insert(b"b")?;
      builder.insert(b"c")?;
      builder.insert(b"d")?;
      builder.finish()?;
      write_buf
    };
    let fst2 = Set::new(fst2_data_vec)?;

    let mut op = FstSetOpBuilder::new();
    op.push(set_from_ufst1.stream());
    op.push(fst2.stream());
    let mut union_stream = op.union();
    let mut results = Vec::new();

    while let Some(key_slice) = union_stream.next() {
      results.push(key_slice.to_vec());
    }
    results.sort();
    assert_eq!(
      results,
      vec![b"a".to_vec(), b"b".to_vec(), b"c".to_vec(), b"d".to_vec()]
    );
    Ok(())
  }

  #[test]
  fn test_bulk_insert_and_finish() -> Result<()> {
    let ufst = new_test_set(3, 0.1, None)?; // Rebuild on 3 adds
    let keys_to_bulk_insert: Vec<Vec<u8>> = (0..5).map(|i| format!("bulk{}", i).into_bytes()).collect();

    let bulk_res = ufst.bulk_insert(keys_to_bulk_insert.clone())?;
    assert_eq!(bulk_res.change_type, FstChangeType::BuffersModified);

    let inner_read = ufst.inner.read();
    assert_eq!(inner_read.mutation_buffer.len(), 5);
    let num_rebuilds_before = inner_read.metrics.num_rebuilds.load(AtomicOrdering::Relaxed);
    assert!(inner_read.add_buffer_changed_since_last_cache);
    drop(inner_read);

    let finish_res = ufst.finish_bulk_operations_and_rebuild_if_needed()?;
    assert_eq!(finish_res.change_type, FstChangeType::FstRebuilt);

    let inner_read_after = ufst.inner.read();
    assert_eq!(
      inner_read_after.metrics.num_rebuilds.load(AtomicOrdering::Relaxed),
      num_rebuilds_before + 1
    );
    assert!(inner_read_after.mutation_buffer.is_empty());
    assert!(!inner_read_after.add_buffer_changed_since_last_cache);
    drop(inner_read_after);

    for key_vec in keys_to_bulk_insert {
      assert!(ufst.contains(&key_vec)?);
    }
    Ok(())
  }

  fn assert_stream_contents(stream: &mut MergedSetStreamOwner<'_>, expected_slices: Vec<&[u8]>) {
    let mut actual_items = Vec::new();
    while let Some(item) = stream.next() {
      actual_items.push(item);
    }
    let expected_owned_items: Vec<Vec<u8>> = expected_slices.iter().map(|s| s.to_vec()).collect();
    assert_eq!(actual_items, expected_owned_items, "Stream contents mismatch");
  }

  #[test]
  fn test_stream_empty_set_direct() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(&mut stream_owner, vec![]);
    assert!(ufst.is_empty()?);
    assert_eq!(ufst.len()?, 0);
    Ok(())
  }

  #[test]
  fn test_stream_persisted_only_simple() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"apple".to_vec())?;
    ufst.insert(b"banana".to_vec())?;
    ufst.force_rebuild()?;

    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(&mut stream_owner, vec![b"apple", b"banana"]);
    Ok(())
  }

  #[test]
  fn test_stream_add_buffer_only_out_of_order() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?; // Empty persisted FST
    ufst.insert(b"zebra".to_vec())?;
    ufst.insert(b"apple".to_vec())?;
    ufst.insert(b"monkey".to_vec())?;

    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(&mut stream_owner, vec![b"apple", b"monkey", b"zebra"]);
    Ok(())
  }

  #[test]
  fn test_stream_persisted_and_add_buffer_interleaved() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"b_persisted".to_vec())?;
    ufst.insert(b"d_persisted".to_vec())?;
    ufst.force_rebuild()?;

    ufst.insert(b"a_added".to_vec())?;
    ufst.insert(b"c_added".to_vec())?;
    ufst.insert(b"e_added".to_vec())?;

    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(
      &mut stream_owner,
      vec![b"a_added", b"b_persisted", b"c_added", b"d_persisted", b"e_added"],
    );
    Ok(())
  }

  #[test]
  fn test_stream_with_deletes_affecting_persisted() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"item1".to_vec())?;
    ufst.insert(b"item2_delete_me".to_vec())?;
    ufst.insert(b"item3".to_vec())?;
    ufst.force_rebuild()?;

    ufst.insert(b"item4_added".to_vec())?;
    ufst.remove(b"item2_delete_me")?;

    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(&mut stream_owner, vec![b"item1", b"item3", b"item4_added"]);
    Ok(())
  }

  #[test]
  fn test_stream_add_overwrites_persisted_key_and_delete_original() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"key1_persisted".to_vec())?;
    ufst.force_rebuild()?;

    // Add the same key to buffer - this should "hide" the persisted one in the stream logic
    ufst.insert(b"key1_persisted".to_vec())?;
    ufst.insert(b"key2_added".to_vec())?;

    ufst.remove(b"key1_persisted")?;

    // Expected: `buffer` contains tombstone for "key1" and Alive for "key2".
    // Stream logic:
    // - "key1": persisted=Yes, buffer=Tombstone -> Skip.
    // - "key2": persisted=No, buffer=Alive -> Yield.

    let mut stream_owner = ufst.stream()?;
    assert_stream_contents(&mut stream_owner, vec![b"key2_added"]);
    Ok(())
  }

  #[test]
  fn test_delete_item_from_persisted_when_also_in_add_buffer_no_rebuild() -> Result<()> {
    let ufst = new_test_set(100, 0.5, None)?;
    ufst.insert(b"key1".to_vec())?;
    ufst.force_rebuild()?;

    ufst.insert(b"key1".to_vec())?;
    ufst.insert(b"key2_added".to_vec())?;

    ufst.remove(b"key1")?;

    // Expected state before streaming:
    // Persisted: {"key1"}
    // Buffer: {"key1": Tombstone, "key2": Alive}

    let mut stream = ufst.stream()?;
    // Expected stream output:
    // - key1: persisted=Alive, buffer=Tombstone -> SKIPPED
    // - key2: persisted=None, buffer=Alive -> YIELDED
    assert_stream_contents(&mut stream, vec![b"key2_added"]);
    Ok(())
  }

  #[test]
  fn test_reinsert_deleted_item_before_rebuild_typical() -> Result<()> {
    let ufst = new_test_set(100, 0.5, None)?;
    ufst.insert(b"a".to_vec())?;
    ufst.insert(b"b_to_delete_and_readd".to_vec())?;
    ufst.insert(b"c".to_vec())?;
    ufst.force_rebuild()?; // Persisted: "a", "b", "c"

    ufst.remove(b"b_to_delete_and_readd")?;
    // At this point: Buffer has {"b": Tombstone}

    ufst.insert(b"b_to_delete_and_readd".to_vec())?;
    // At this point: Buffer has {"b": Alive} (Resurrected)

    let mut stream = ufst.stream()?;
    // Expected stream:
    // "a" (persisted, not in buffer)
    // "b" (persisted, buffer=Alive -> Override -> Yield)
    // "c" (persisted, not in buffer)
    assert_stream_contents(&mut stream, vec![b"a", b"b_to_delete_and_readd", b"c"]);
    Ok(())
  }

  #[test]
  fn test_stream_with_empty_string_key() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"".to_vec())?;
    ufst.insert(b"alpha".to_vec())?;
    ufst.force_rebuild()?; // Persisted: "", "alpha"

    ufst.insert(b"beta".to_vec())?;
    ufst.insert(b"".to_vec())?;
    ufst.remove(b"alpha")?;

    // Persisted: {"", "alpha"}
    // Buffer: {"": Alive, "beta": Alive, "alpha": Tombstone}

    let mut stream = ufst.stream()?;
    // Expected: "" (from buffer override), "beta"
    assert_stream_contents(&mut stream, vec![b"", b"beta"]);
    Ok(())
  }

  #[test]
  fn test_multiple_independent_streams_on_same_state() -> Result<()> {
    let ufst = new_test_set(10, 0.1, None)?;
    ufst.insert(b"persisted1".to_vec())?;
    ufst.force_rebuild()?;
    ufst.insert(b"added1".to_vec())?;
    ufst.remove(b"persisted1")?;
    ufst.insert(b"added2".to_vec())?;
    // Expected content for any stream: "added1", "added2"

    let expected_vec = vec![b"added1".to_vec(), b"added2".to_vec()];

    let mut stream1 = ufst.stream()?;
    let mut items1 = Vec::new();
    while let Some(item) = stream1.next() {
      items1.push(item);
    }
    assert_eq!(items1, expected_vec);
    assert!(stream1.next().is_none(), "Stream1 should be exhausted");

    let mut stream2 = ufst.stream()?;
    let mut items2 = Vec::new();
    while let Some(item) = stream2.next() {
      items2.push(item);
    }
    assert_eq!(items2, expected_vec);
    assert!(stream2.next().is_none(), "Stream2 should be exhausted");
    Ok(())
  }
}