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

3.0 fork #2

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
use config commit ttl everywhere
jmhrpr committed Jan 30, 2025
commit d152e2e38f1d551d151ee22d56aef737846a9ede
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -156,12 +156,12 @@ pub use crate::timestamp::TimestampExt;
#[doc(inline)]
pub use crate::transaction::lowering as transaction_lowering;
#[doc(inline)]
pub use crate::transaction::CommitTTLParameters;
#[doc(inline)]
pub use crate::transaction::CheckLevel;
#[doc(inline)]
pub use crate::transaction::Client as TransactionClient;
#[doc(inline)]
pub use crate::transaction::CommitTTLParameters;
#[doc(inline)]
pub use crate::transaction::Snapshot;
#[doc(inline)]
pub use crate::transaction::Transaction;
7 changes: 4 additions & 3 deletions src/transaction/transaction.rs
Original file line number Diff line number Diff line change
@@ -743,7 +743,7 @@ impl<Cod: Codec, PdC: PdClient<Codec = Cod>> Transaction<Cod, PdC> {
let request = new_heart_beat_request(
self.timestamp.clone(),
primary_key,
self.start_instant.elapsed().as_millis() as u64 + MAX_TTL,
self.start_instant.elapsed().as_millis() as u64 + self.options.ttl_parameters.max_ttl,
);
let encoded_req = EncodedRequest::new(request, self.rpc.get_codec());
let plan = PlanBuilder::new(self.rpc.clone(), encoded_req)
@@ -828,7 +828,7 @@ impl<Cod: Codec, PdC: PdClient<Codec = Cod>> Transaction<Cod, PdC> {
keys.clone().into_iter(),
primary_lock,
self.timestamp.clone(),
MAX_TTL,
self.options.ttl_parameters.max_ttl,
for_update_ts.clone(),
need_value,
);
@@ -923,6 +923,7 @@ impl<Cod: Codec, PdC: PdClient<Codec = Cod>> Transaction<Cod, PdC> {
return;
}
self.is_heartbeat_started = true;
let max_ttl = self.options.ttl_parameters.max_ttl;

let status = self.status.clone();
let primary_key = self
@@ -955,7 +956,7 @@ impl<Cod: Codec, PdC: PdClient<Codec = Cod>> Transaction<Cod, PdC> {
let request = new_heart_beat_request(
start_ts.clone(),
primary_key.clone(),
start_instant.elapsed().as_millis() as u64 + MAX_TTL,
start_instant.elapsed().as_millis() as u64 + max_ttl,
);
let encoded_req = EncodedRequest::new(request, rpc.get_codec());
let plan = PlanBuilder::new(rpc.clone(), encoded_req)