@@ -6,7 +6,6 @@ use super::hash_ring::HashRing;
66pub mod client_sessions;
77pub ( crate ) mod heartbeat_scheduler;
88use super :: * ;
9- use crate :: adapters:: loggers:: op_logs:: OperationLogs ;
109use crate :: domains:: QueryIO ;
1110use crate :: domains:: TAsyncReadWrite ;
1211use crate :: domains:: caches:: cache_manager:: CacheManager ;
@@ -59,7 +58,7 @@ const FANOUT: usize = 2;
5958#[ derive( Debug ) ]
6059pub 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,
0 commit comments