Skip to content

Commit 36a0950

Browse files
committed
visibility control
1 parent 4b297cb commit 36a0950

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

duva/src/adapters/loggers/disk_based.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl Segment {
179179
}
180180

181181
impl FileOpLogs {
182-
pub fn new<P: AsRef<Path>>(path: P) -> Result<Self> {
182+
pub(super) fn new<P: AsRef<Path>>(path: P) -> Result<Self> {
183183
let path = path.as_ref().to_path_buf();
184184
Self::validate_folder(&path)?;
185185
let segment_paths = Self::detect_and_sort_existing_segments(&path)?;

duva/src/adapters/loggers/memory_based.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use anyhow::Result;
55

66
#[derive(Default, Clone, Debug)]
77
pub struct MemoryOpLogs {
8-
pub writer: Vec<WriteOperation>,
8+
writer: Vec<WriteOperation>,
99
}
1010

1111
impl TWriteAheadLog for MemoryOpLogs {

duva/src/domains/cluster_actors/actor.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use super::hash_ring::HashRing;
66
pub mod client_sessions;
77
pub(crate) mod heartbeat_scheduler;
88
use super::*;
9-
use crate::adapters::loggers::op_logs::OperationLogs;
109
use crate::domains::QueryIO;
1110
use crate::domains::TAsyncReadWrite;
1211
use crate::domains::caches::cache_manager::CacheManager;
@@ -59,7 +58,7 @@ const FANOUT: usize = 2;
5958
#[derive(Debug)]
6059
pub struct ClusterActor {
6160
pub(crate) members: BTreeMap<PeerIdentifier, Peer>,
62-
pub(crate) replication: Replication<OperationLogs>,
61+
pub(crate) replication: Replication,
6362
pub(crate) consensus_tracker: LogConsensusTracker,
6463
pub(crate) receiver: ClusterActorReceiver,
6564
pub(crate) self_handler: ClusterActorSender,
@@ -98,7 +97,7 @@ impl ClusterActor {
9897
pub(crate) fn run(
9998
topology_writer: std::fs::File,
10099
heartbeat_interval: u64,
101-
replication: Replication<OperationLogs>,
100+
replication: Replication,
102101
cache_manager: CacheManager,
103102
) -> ClusterActorSender {
104103
let cluster_actor =
@@ -113,27 +112,27 @@ impl ClusterActor {
113112
}
114113

115114
fn new(
116-
init_repl_state: Replication<OperationLogs>,
115+
init_repl: Replication,
117116
heartbeat_interval_in_mills: u64,
118117
topology_writer: File,
119118
cache_manager: CacheManager,
120119
) -> Self {
121120
let (self_handler, receiver) = ClusterActorQueue::create(2000);
122121
let heartbeat_scheduler = HeartBeatScheduler::run(
123122
self_handler.clone(),
124-
init_repl_state.is_leader(),
123+
init_repl.is_leader(),
125124
heartbeat_interval_in_mills,
126125
);
127126

128127
let (tx, _) = tokio::sync::broadcast::channel::<Topology>(100);
129128
let hash_ring = HashRing::default().add_partitions(vec![(
130-
init_repl_state.clone_state().replid.clone(),
131-
init_repl_state.self_identifier(),
129+
init_repl.clone_state().replid.clone(),
130+
init_repl.self_identifier(),
132131
)]);
133132

134133
Self {
135134
heartbeat_scheduler,
136-
replication: init_repl_state,
135+
replication: init_repl,
137136
receiver,
138137
self_handler,
139138
topology_writer,

duva/src/domains/cluster_actors/actor/tests/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use crate::CacheManager;
99
use crate::Replication;
1010
use crate::ReplicationId;
1111

12+
use crate::adapters::loggers::op_logs::OperationLogs;
1213
use crate::domains::TSerdeDynamicRead;
1314
use crate::domains::TSerdeDynamicWrite;
1415
use crate::domains::caches::actor::CacheCommandSender;

duva/src/domains/cluster_actors/actor/tests/replications.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use crate::adapters::loggers::op_logs::OperationLogs;
2+
13
use super::*;
24

35
#[test]
@@ -356,7 +358,8 @@ async fn follower_truncates_log_on_term_mismatch() {
356358
//prefill
357359

358360
inmemory
359-
.write_many(vec![Helper::write(2, 1, "key1", "val1"), Helper::write(3, 1, "key2", "val2")]);
361+
.write_many(vec![Helper::write(2, 1, "key1", "val1"), Helper::write(3, 1, "key2", "val2")])
362+
.unwrap();
360363

361364
let mut cluster_actor = Helper::cluster_actor(ReplicationRole::Leader).await;
362365
cluster_actor.replication.set_target(inmemory);

duva/src/domains/replications/replication.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ use std::sync::atomic::AtomicU64;
1616
use std::sync::atomic::Ordering;
1717

1818
#[derive(Debug)]
19-
pub(crate) struct Replication<T> {
19+
pub(crate) struct Replication {
2020
pub(crate) self_port: u16,
2121
election_votes: ElectionVotes,
22-
logger: T,
22+
logger: OperationLogs,
2323
state: ReplicationState,
2424
last_log_term: u64,
2525
con_idx: Arc<AtomicU64>,
2626
last_applied: u64,
2727
in_mem_buffer: Vec<WriteOperation>,
2828
}
2929

30-
impl Replication<OperationLogs> {
30+
impl Replication {
3131
pub(crate) fn new(self_port: u16, logger: OperationLogs, state: ReplicationState) -> Self {
3232
Self {
3333
election_votes: ElectionVotes::default(),

0 commit comments

Comments
 (0)