rename swap_strategy to segment_swap_strategy

Author: MarinPostma

libsql-wal/src/lib.rs

@@ -10,7 +10,7 @@ pub mod shared_wal;
 pub mod storage;
 pub mod transaction;
 pub mod wal;
-mod swap_strategy;
+mod segment_swap_strategy;
 
 const LIBSQL_MAGIC: u64 = u64::from_be_bytes(*b"LIBSQL\0\0");
 const LIBSQL_PAGE_SIZE: u16 = 4096;

libsql-wal/src/registry.rs

@@ -27,10 +27,10 @@ use crate::segment::Segment;
 use crate::segment::{current::CurrentSegment, sealed::SealedSegment};
 use crate::shared_wal::{SharedWal, SwapLog};
 use crate::storage::{OnStoreCallback, Storage};
-use crate::swap_strategy::duration::DurationSwapStrategy;
-use crate::swap_strategy::frame_count::FrameCountSwapStrategy;
-use crate::swap_strategy::SwapStrategy;
 use crate::transaction::TxGuard;
+use crate::segment_swap_strategy::duration::DurationSwapStrategy;
+use crate::segment_swap_strategy::frame_count::FrameCountSwapStrategy;
+use crate::segment_swap_strategy::SegmentSwapStrategy;
 use crate::{LibsqlFooter, LIBSQL_PAGE_SIZE};
 use libsql_sys::name::NamespaceName;
 

libsql-wal/src/swap_strategy/duration.rs …al/src/segment_swap_strategy/duration.rslibsql-wal/src/swap_strategy/duration.rs renamed to libsql-wal/src/segment_swap_strategy/duration.rs libsql-wal/src/swap_strategy/duration.rs renamed to libsql-wal/src/segment_swap_strategy/duration.rs

@@ -2,7 +2,7 @@ use std::time::{Duration, Instant};
 
 use parking_lot::Mutex;
 
-use super::SwapStrategy;
+use super::SegmentSwapStrategy;
 
 /// A wal swap strategy that swaps the current wal if it's older that some duration
 pub struct DurationSwapStrategy {
@@ -16,7 +16,7 @@ impl DurationSwapStrategy {
     }
 }
 
-impl SwapStrategy for DurationSwapStrategy {
+impl SegmentSwapStrategy for DurationSwapStrategy {
     #[inline(always)]
     fn should_swap(&self, _frames_in_wal: usize) -> bool {
         let last_swapped_at = self.last_swapped_at.lock();

…sql-wal/src/swap_strategy/frame_count.rs …src/segment_swap_strategy/frame_count.rslibsql-wal/src/swap_strategy/frame_count.rs renamed to libsql-wal/src/segment_swap_strategy/frame_count.rs libsql-wal/src/swap_strategy/frame_count.rs renamed to libsql-wal/src/segment_swap_strategy/frame_count.rs

@@ -1,4 +1,4 @@
-use super::SwapStrategy;
+use super::SegmentSwapStrategy;
 
 /// A swap strategy that swaps if the count of frames in the wal exceed some threshold
 pub struct FrameCountSwapStrategy {
@@ -11,7 +11,7 @@ impl FrameCountSwapStrategy {
     }
 }
 
-impl SwapStrategy for FrameCountSwapStrategy {
+impl SegmentSwapStrategy for FrameCountSwapStrategy {
     #[inline(always)]
     fn should_swap(&self, frames_in_wal: usize) -> bool {
         frames_in_wal >= self.max_frames_in_wal

libsql-wal/src/swap_strategy/mod.rs …sql-wal/src/segment_swap_strategy/mod.rslibsql-wal/src/swap_strategy/mod.rs renamed to libsql-wal/src/segment_swap_strategy/mod.rs libsql-wal/src/swap_strategy/mod.rs renamed to libsql-wal/src/segment_swap_strategy/mod.rs

@@ -1,18 +1,18 @@
 pub(crate) mod duration;
 pub(crate) mod frame_count;
 
-pub(crate) trait SwapStrategy: Sync + Send + 'static {
+pub(crate) trait SegmentSwapStrategy: Sync + Send + 'static {
     fn should_swap(&self, frames_in_wal: usize) -> bool;
     fn swapped(&self);
 
-    fn and<O: SwapStrategy>(self, other: O) -> And<Self, O>
+    fn and<O: SegmentSwapStrategy>(self, other: O) -> And<Self, O>
     where
         Self: Sized,
     {
         And(self, other)
     }
 
-    fn or<O: SwapStrategy>(self, other: O) -> Or<Self, O>
+    fn or<O: SegmentSwapStrategy>(self, other: O) -> Or<Self, O>
     where
         Self: Sized,
     {
@@ -22,10 +22,10 @@ pub(crate) trait SwapStrategy: Sync + Send + 'static {
 
 pub struct And<A, B>(A, B);
 
-impl<A, B> SwapStrategy for And<A, B>
+impl<A, B> SegmentSwapStrategy for And<A, B>
 where
-    A: SwapStrategy,
-    B: SwapStrategy,
+    A: SegmentSwapStrategy,
+    B: SegmentSwapStrategy,
 {
     #[inline(always)]
     fn should_swap(&self, frames_in_wal: usize) -> bool {
@@ -41,10 +41,10 @@ where
 
 pub struct Or<A, B>(A, B);
 
-impl<A, B> SwapStrategy for Or<A, B>
+impl<A, B> SegmentSwapStrategy for Or<A, B>
 where
-    A: SwapStrategy,
-    B: SwapStrategy,
+    A: SegmentSwapStrategy,
+    B: SegmentSwapStrategy,
 {
     #[inline(always)]
     fn should_swap(&self, frames_in_wal: usize) -> bool {

libsql-wal/src/shared_wal.rs

@@ -16,8 +16,8 @@ use crate::io::file::FileExt;
 use crate::io::Io;
 use crate::replication::storage::ReplicateFromStorage;
 use crate::segment::current::CurrentSegment;
-use crate::swap_strategy::SwapStrategy;
 use crate::transaction::{ReadTransaction, Savepoint, Transaction, TxGuard, WriteTransaction};
+use crate::segment_swap_strategy::SegmentSwapStrategy;
 use libsql_sys::name::NamespaceName;
 
 #[derive(Default)]
@@ -54,7 +54,7 @@ pub struct SharedWal<IO: Io> {
     pub(crate) shutdown: AtomicBool,
     pub(crate) checkpoint_notifier: mpsc::Sender<CheckpointMessage>,
     pub(crate) io: Arc<IO>,
-    pub(crate) swap_strategy: Box<dyn SwapStrategy>,
+    pub(crate) swap_strategy: Box<dyn SegmentSwapStrategy>,
 }
 
 impl<IO: Io> SharedWal<IO> {