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.

Sign up for GitHub

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

Jump to bottom

async_nats: pull: Use u64 instead of usize for nanoseconds #901

Merged
merged 1 commit into from
Mar 28, 2023
Merged

async_nats: pull: Use u64 instead of usize for nanoseconds #901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions async-nats/src/jetstream/consumer/pull.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ impl<'a> Batch {

let sleep = batch.expires.map(|e| {
Box::pin(tokio::time::sleep(
Duration::from_nanos(e as u64).saturating_add(Duration::from_secs(5)),
Duration::from_nanos(e).saturating_add(Duration::from_secs(5)),
))
});

Expand Down Expand Up @@ -500,8 +500,7 @@ impl Stream {
.map(|expires| match expires {
0 => futures::future::Either::Left(future::pending()),
t => futures::future::Either::Right(tokio::time::sleep(
Duration::from_nanos(t as u64)
.saturating_add(Duration::from_secs(5)),
Duration::from_nanos(t).saturating_add(Duration::from_secs(5)),
)),
})
.unwrap_or_else(|| futures::future::Either::Left(future::pending()));
Expand Down Expand Up @@ -811,7 +810,7 @@ pub struct StreamBuilder<'a> {
batch: usize,
max_bytes: usize,
heartbeat: Duration,
expires: usize,
expires: u64,
consumer: &'a Consumer<Config>,
}

Expand Down Expand Up @@ -1047,7 +1046,7 @@ pub struct FetchBuilder<'a> {
batch: usize,
max_bytes: usize,
heartbeat: Duration,
expires: Option<usize>,
expires: Option<u64>,
consumer: &'a Consumer<Config>,
}

Expand Down Expand Up @@ -1282,7 +1281,7 @@ pub struct BatchBuilder<'a> {
batch: usize,
max_bytes: usize,
heartbeat: Duration,
expires: usize,
expires: u64,
consumer: &'a Consumer<Config>,
}

Expand Down Expand Up @@ -1493,7 +1492,7 @@ pub struct BatchConfig {
/// The optional number of nanoseconds that the server will store this next request for
/// before forgetting about the pending batch size.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub expires: Option<usize>,
pub expires: Option<u64>,
/// This optionally causes the server not to store this pending request at all, but when there are no
/// messages to deliver will send a nil bytes message with a Status header of 404, this way you
/// can know when you reached the end of the stream for example. A 409 is returned if the
Expand Down