tikv
/
client-rust
mirror of https://github.com/tikv/client-rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: rename PropagateError to ExtractError 

Signed-off-by: ekexium <ekexium@gmail.com>
This commit is contained in:
ekexium 2021-03-03 11:26:34 +08:00
parent 0e2284c10f
commit 212dfd1f2a
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/raw/client.rs
View File

@ -179,7 +179,7 @@ impl Client {
.await? .await?
.resolve_lock(OPTIMISTIC_BACKOFF) .resolve_lock(OPTIMISTIC_BACKOFF)
.retry_region(DEFAULT_REGION_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())
@ -211,7 +211,7 @@ impl Client {
.resolve_lock(OPTIMISTIC_BACKOFF) .resolve_lock(OPTIMISTIC_BACKOFF)
.multi_region() .multi_region()
.retry_region(DEFAULT_REGION_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())
@ -241,7 +241,7 @@ impl Client {
.await? .await?
.resolve_lock(OPTIMISTIC_BACKOFF) .resolve_lock(OPTIMISTIC_BACKOFF)
.retry_region(DEFAULT_REGION_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())
@ -271,7 +271,7 @@ impl Client {
.resolve_lock(OPTIMISTIC_BACKOFF) .resolve_lock(OPTIMISTIC_BACKOFF)
.multi_region() .multi_region()
.retry_region(DEFAULT_REGION_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())
@ -298,7 +298,7 @@ impl Client {
.resolve_lock(OPTIMISTIC_BACKOFF) .resolve_lock(OPTIMISTIC_BACKOFF)
.multi_region() .multi_region()
.retry_region(DEFAULT_REGION_BACKOFF) .retry_region(DEFAULT_REGION_BACKOFF)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())

6
src/request/mod.rs
View File

@ -10,8 +10,8 @@ use tikv_client_store::{HasError, Request};
pub use self::{ pub use self::{
plan::{ plan::{
Collect, CollectError, DefaultProcessor, Dispatch, Merge, MergeResponse, MultiRegion, Plan, Collect, CollectError, DefaultProcessor, Dispatch, ExtractError, Merge, MergeResponse,
Process, ProcessResponse, PropagateError, ResolveLock, RetryRegion, MultiRegion, Plan, Process, ProcessResponse, ResolveLock, RetryRegion,
}, },
plan_builder::{PlanBuilder, SingleKey}, plan_builder::{PlanBuilder, SingleKey},
shard::Shardable, shard::Shardable,
@ -167,7 +167,7 @@ mod test {
.resolve_lock(Backoff::no_jitter_backoff(1, 1, 3)) .resolve_lock(Backoff::no_jitter_backoff(1, 1, 3))
.multi_region() .multi_region()
.retry_region(Backoff::no_jitter_backoff(1, 1, 3)) .retry_region(Backoff::no_jitter_backoff(1, 1, 3))
.propagate_error() .extract_error()
.plan(); .plan();
let _ = executor::block_on(async { plan.execute().await }); let _ = executor::block_on(async { plan.execute().await });

8
src/request/plan.rs
View File

@ -249,20 +249,20 @@ where
} }
} }
pub struct PropagateError<P: Plan> { pub struct ExtractError<P: Plan> {
pub inner: P, pub inner: P,
} }
impl<P: Plan> Clone for PropagateError<P> { impl<P: Plan> Clone for ExtractError<P> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
PropagateError { ExtractError {
inner: self.inner.clone(), inner: self.inner.clone(),
} }
} }
} }
#[async_trait] #[async_trait]
impl<P: Plan> Plan for PropagateError<P> impl<P: Plan> Plan for ExtractError<P>
where where
P::Result: HasError, P::Result: HasError,
{ {

8
src/request/plan_builder.rs
View File

@ -4,8 +4,8 @@ use crate::{
backoff::Backoff, backoff::Backoff,
pd::PdClient, pd::PdClient,
request::{ request::{
DefaultProcessor, Dispatch, KvRequest, Merge, MergeResponse, MultiRegion, Plan, Process, DefaultProcessor, Dispatch, ExtractError, KvRequest, Merge, MergeResponse, MultiRegion,
ProcessResponse, PropagateError, ResolveLock, RetryRegion, Shardable, Plan, Process, ProcessResponse, ResolveLock, RetryRegion, Shardable,
}, },
store::Store, store::Store,
transaction::HasLocks, transaction::HasLocks,
@ -165,10 +165,10 @@ impl<PdC: PdClient, P: Plan> PlanBuilder<PdC, P, Targetted>
where where
P::Result: HasError, P::Result: HasError,
{ {
pub fn propagate_error(self) -> PlanBuilder<PdC, PropagateError<P>, Targetted> { pub fn extract_error(self) -> PlanBuilder<PdC, ExtractError<P>, Targetted> {
PlanBuilder { PlanBuilder {
pd_client: self.pd_client, pd_client: self.pd_client,
plan: PropagateError { inner: self.plan }, plan: ExtractError { inner: self.plan },
phantom: self.phantom, phantom: self.phantom,
} }
} }

2
src/transaction/lock.rs
View File

@ -104,7 +104,7 @@ async fn resolve_lock_with_retry(
.await? .await?
.resolve_lock(Backoff::no_backoff()) .resolve_lock(Backoff::no_backoff())
.retry_region(Backoff::no_backoff()) .retry_region(Backoff::no_backoff())
.propagate_error() .extract_error()
.plan(); .plan();
match plan.execute().await { match plan.execute().await {
Ok(_) => { Ok(_) => {

10
src/transaction/transaction.rs
View File

@ -901,7 +901,7 @@ impl Committer {
.multi_region() .multi_region()
.retry_region(self.options.retry_options.region_backoff.clone()) .retry_region(self.options.retry_options.region_backoff.clone())
.merge(CollectError) .merge(CollectError)
.propagate_error() .extract_error()
.plan(); .plan();
let response = plan.execute().await?; let response = plan.execute().await?;
@ -940,7 +940,7 @@ impl Committer {
.resolve_lock(self.options.retry_options.lock_backoff.clone()) .resolve_lock(self.options.retry_options.lock_backoff.clone())
.multi_region() .multi_region()
.retry_region(self.options.retry_options.region_backoff.clone()) .retry_region(self.options.retry_options.region_backoff.clone())
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute() plan.execute()
.inspect_err(|e| { .inspect_err(|e| {
@ -977,7 +977,7 @@ impl Committer {
.resolve_lock(self.options.retry_options.lock_backoff) .resolve_lock(self.options.retry_options.lock_backoff)
.multi_region() .multi_region()
.retry_region(self.options.retry_options.region_backoff) .retry_region(self.options.retry_options.region_backoff)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
Ok(()) Ok(())
@ -998,7 +998,7 @@ impl Committer {
.resolve_lock(self.options.retry_options.lock_backoff) .resolve_lock(self.options.retry_options.lock_backoff)
.multi_region() .multi_region()
.retry_region(self.options.retry_options.region_backoff) .retry_region(self.options.retry_options.region_backoff)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
} }
@ -1008,7 +1008,7 @@ impl Committer {
.resolve_lock(self.options.retry_options.lock_backoff) .resolve_lock(self.options.retry_options.lock_backoff)
.multi_region() .multi_region()
.retry_region(self.options.retry_options.region_backoff) .retry_region(self.options.retry_options.region_backoff)
.propagate_error() .extract_error()
.plan(); .plan();
plan.execute().await?; plan.execute().await?;
} }