diff --git a/src/raw/client.rs b/src/raw/client.rs index 93df979..c1137df 100644 --- a/src/raw/client.rs +++ b/src/raw/client.rs @@ -179,7 +179,7 @@ impl Client { .await? .resolve_lock(OPTIMISTIC_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) @@ -211,7 +211,7 @@ impl Client { .resolve_lock(OPTIMISTIC_BACKOFF) .multi_region() .retry_region(DEFAULT_REGION_BACKOFF) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) @@ -241,7 +241,7 @@ impl Client { .await? .resolve_lock(OPTIMISTIC_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) @@ -271,7 +271,7 @@ impl Client { .resolve_lock(OPTIMISTIC_BACKOFF) .multi_region() .retry_region(DEFAULT_REGION_BACKOFF) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) @@ -298,7 +298,7 @@ impl Client { .resolve_lock(OPTIMISTIC_BACKOFF) .multi_region() .retry_region(DEFAULT_REGION_BACKOFF) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) diff --git a/src/request/mod.rs b/src/request/mod.rs index 3406207..c112530 100644 --- a/src/request/mod.rs +++ b/src/request/mod.rs @@ -10,8 +10,8 @@ use tikv_client_store::{HasError, Request}; pub use self::{ plan::{ - Collect, CollectError, DefaultProcessor, Dispatch, Merge, MergeResponse, MultiRegion, Plan, - Process, ProcessResponse, PropagateError, ResolveLock, RetryRegion, + Collect, CollectError, DefaultProcessor, Dispatch, ExtractError, Merge, MergeResponse, + MultiRegion, Plan, Process, ProcessResponse, ResolveLock, RetryRegion, }, plan_builder::{PlanBuilder, SingleKey}, shard::Shardable, @@ -167,7 +167,7 @@ mod test { .resolve_lock(Backoff::no_jitter_backoff(1, 1, 3)) .multi_region() .retry_region(Backoff::no_jitter_backoff(1, 1, 3)) - .propagate_error() + .extract_error() .plan(); let _ = executor::block_on(async { plan.execute().await }); diff --git a/src/request/plan.rs b/src/request/plan.rs index 0555a59..78eec54 100644 --- a/src/request/plan.rs +++ b/src/request/plan.rs @@ -249,20 +249,20 @@ where } } -pub struct PropagateError { +pub struct ExtractError { pub inner: P, } -impl Clone for PropagateError

{ +impl Clone for ExtractError

{ fn clone(&self) -> Self { - PropagateError { + ExtractError { inner: self.inner.clone(), } } } #[async_trait] -impl Plan for PropagateError

+impl Plan for ExtractError

where P::Result: HasError, { diff --git a/src/request/plan_builder.rs b/src/request/plan_builder.rs index 98279b8..c1cf39c 100644 --- a/src/request/plan_builder.rs +++ b/src/request/plan_builder.rs @@ -4,8 +4,8 @@ use crate::{ backoff::Backoff, pd::PdClient, request::{ - DefaultProcessor, Dispatch, KvRequest, Merge, MergeResponse, MultiRegion, Plan, Process, - ProcessResponse, PropagateError, ResolveLock, RetryRegion, Shardable, + DefaultProcessor, Dispatch, ExtractError, KvRequest, Merge, MergeResponse, MultiRegion, + Plan, Process, ProcessResponse, ResolveLock, RetryRegion, Shardable, }, store::Store, transaction::HasLocks, @@ -165,10 +165,10 @@ impl PlanBuilder where P::Result: HasError, { - pub fn propagate_error(self) -> PlanBuilder, Targetted> { + pub fn extract_error(self) -> PlanBuilder, Targetted> { PlanBuilder { pd_client: self.pd_client, - plan: PropagateError { inner: self.plan }, + plan: ExtractError { inner: self.plan }, phantom: self.phantom, } } diff --git a/src/transaction/lock.rs b/src/transaction/lock.rs index 182dd3d..4e55017 100644 --- a/src/transaction/lock.rs +++ b/src/transaction/lock.rs @@ -104,7 +104,7 @@ async fn resolve_lock_with_retry( .await? .resolve_lock(Backoff::no_backoff()) .retry_region(Backoff::no_backoff()) - .propagate_error() + .extract_error() .plan(); match plan.execute().await { Ok(_) => { diff --git a/src/transaction/transaction.rs b/src/transaction/transaction.rs index 83a5920..7a13055 100644 --- a/src/transaction/transaction.rs +++ b/src/transaction/transaction.rs @@ -901,7 +901,7 @@ impl Committer { .multi_region() .retry_region(self.options.retry_options.region_backoff.clone()) .merge(CollectError) - .propagate_error() + .extract_error() .plan(); let response = plan.execute().await?; @@ -940,7 +940,7 @@ impl Committer { .resolve_lock(self.options.retry_options.lock_backoff.clone()) .multi_region() .retry_region(self.options.retry_options.region_backoff.clone()) - .propagate_error() + .extract_error() .plan(); plan.execute() .inspect_err(|e| { @@ -977,7 +977,7 @@ impl Committer { .resolve_lock(self.options.retry_options.lock_backoff) .multi_region() .retry_region(self.options.retry_options.region_backoff) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; Ok(()) @@ -998,7 +998,7 @@ impl Committer { .resolve_lock(self.options.retry_options.lock_backoff) .multi_region() .retry_region(self.options.retry_options.region_backoff) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; } @@ -1008,7 +1008,7 @@ impl Committer { .resolve_lock(self.options.retry_options.lock_backoff) .multi_region() .retry_region(self.options.retry_options.region_backoff) - .propagate_error() + .extract_error() .plan(); plan.execute().await?; }