Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Fix some typo Event change_listener #2382

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/fluvio-sc/src/stores/spu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ mod health_check {
}

pub fn listener(&self) -> OffsetChangeListener {
self.event.change_listner()
self.event.change_listener()
}

/// update health check
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/src/replication/follower/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ mod inner {
let (mut sink, mut stream) = socket.split();
let mut api_stream = stream.api_stream::<FollowerPeerRequest, FollowerPeerApiEnum>();

let mut event_listener = self.group.events.change_listner();
let mut event_listener = self.group.events.change_listener();

// starts initial sync
debug!("performing initial offset sync to leader");
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/src/replication/leader/spu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub struct FollowerSpuPendingUpdates {

impl FollowerSpuPendingUpdates {
pub fn listener(&self) -> OffsetChangeListener {
self.event.change_listner()
self.event.change_listener()
}

/// add replica to be updated
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-spu/src/services/public/stream_fetch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl StreamFetchHandler {
if let Some(leader_state) = ctx.leaders_state().get(&replica).await {
let (stream_id, offset_publisher) =
ctx.stream_publishers().create_new_publisher().await;
let consumer_offset_listener = offset_publisher.change_listner();
let consumer_offset_listener = offset_publisher.change_listener();

spawn(async move {
if let Err(err) = StreamFetchHandler::fetch(
Expand Down
4 changes: 2 additions & 2 deletions crates/fluvio-spu/src/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ where
/// listen to offset based on isolation
pub fn offset_listener(&self, isolation: &Isolation) -> OffsetChangeListener {
match isolation {
Isolation::ReadCommitted => self.hw.change_listner(),
Isolation::ReadUncommitted => self.leo.change_listner(),
Isolation::ReadCommitted => self.hw.change_listener(),
Isolation::ReadUncommitted => self.leo.change_listener(),
}
}

Expand Down
9 changes: 7 additions & 2 deletions crates/fluvio-types/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,12 @@ pub mod offsets {
self.update(self.current_value() + 1);
}

#[deprecated = "Replace by change_listener"]
pub fn change_listner(self: &Arc<Self>) -> OffsetChangeListener {
self.change_listener()
}

pub fn change_listener(self: &Arc<Self>) -> OffsetChangeListener {
OffsetChangeListener::new(self.clone())
}
}
Expand Down Expand Up @@ -238,7 +243,7 @@ mod test {
#[fluvio_future::test]
async fn test_offset_listener_no_wait() {
let publisher = OffsetPublisher::shared(0);
let listener = publisher.change_listner();
let listener = publisher.change_listener();
let status = Arc::new(AtomicBool::new(false));

TestController::start(listener, status.clone());
Expand All @@ -265,7 +270,7 @@ mod test {
#[fluvio_future::test]
async fn test_offset_listener_wait() {
let publisher = OffsetPublisher::shared(0);
let listener = publisher.change_listner();
let listener = publisher.change_listener();
let status = Arc::new(AtomicBool::new(false));

TestController::start(listener, status.clone());
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio/src/consumer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ where
);

let publisher = OffsetPublisher::shared(0);
let mut listener = publisher.change_listner();
let mut listener = publisher.change_listener();

// update stream with received offsets
spawn(async move {
Expand Down