Skip to content

Commit 71af50d

Browse files
committed
cargo fmt
Signed-off-by: iosmanthus <[email protected]>
1 parent 624c68e commit 71af50d

File tree

6 files changed

+46
-31
lines changed

6 files changed

+46
-31
lines changed

examples/pessimistic.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ mod common;
44

55
use crate::common::parse_args;
66
use tikv_client::{
7-
request::codec::TxnApiV1, Config, Key, TransactionClient as Client, TransactionOptions,
8-
Value,
7+
request::codec::TxnApiV1, Config, Key, TransactionClient as Client, TransactionOptions, Value,
98
};
109

1110
#[tokio::main]

examples/raw.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ mod common;
66

77
use crate::common::parse_args;
88
use tikv_client::{
9-
request::codec::RawApiV1, Config, IntoOwnedRange, Key, KvPair, RawClient as Client,
10-
Result, Value,
9+
request::codec::RawApiV1, Config, IntoOwnedRange, Key, KvPair, RawClient as Client, Result,
10+
Value,
1111
};
1212

1313
const KEY: &str = "TiKV";

src/raw/requests.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ use tikv_client_store::Request;
1111

1212
use crate::{
1313
collect_first,
14-
ColumnFamily,
15-
Key,
16-
KvPair,
1714
pd::PdClient,
1815
request::{
19-
codec::RequestCodec, Collect, CollectSingle, DefaultProcessor, KvRequest,
20-
Merge, plan::ResponseWithShard, Process, Shardable, SingleKey,
16+
codec::RequestCodec, plan::ResponseWithShard, Collect, CollectSingle, DefaultProcessor,
17+
KvRequest, Merge, Process, Shardable, SingleKey,
2118
},
22-
Result, store::{RegionStore, store_stream_for_keys, store_stream_for_ranges}, transaction::HasLocks, util::iter::FlatMapOkIterExt, Value,
19+
store::{store_stream_for_keys, store_stream_for_ranges, RegionStore},
20+
transaction::HasLocks,
21+
util::iter::FlatMapOkIterExt,
22+
ColumnFamily, Key, KvPair, Result, Value,
2323
};
2424

2525
use super::RawRpcRequest;
@@ -371,7 +371,7 @@ impl Process<kvrpcpb::RawCasResponse> for DefaultProcessor {
371371
}
372372

373373
type RawCoprocessorRequestDataBuilder =
374-
Arc<dyn Fn(metapb::Region, Vec<kvrpcpb::KeyRange>) -> Vec<u8> + Send + Sync>;
374+
Arc<dyn Fn(metapb::Region, Vec<kvrpcpb::KeyRange>) -> Vec<u8> + Send + Sync>;
375375

376376
pub fn new_raw_coprocessor_request(
377377
copr_name: String,
@@ -441,8 +441,8 @@ impl Shardable for RawCoprocessorRequest {
441441

442442
#[allow(clippy::type_complexity)]
443443
impl
444-
Process<Vec<Result<ResponseWithShard<kvrpcpb::RawCoprocessorResponse, Vec<kvrpcpb::KeyRange>>>>>
445-
for DefaultProcessor
444+
Process<Vec<Result<ResponseWithShard<kvrpcpb::RawCoprocessorResponse, Vec<kvrpcpb::KeyRange>>>>>
445+
for DefaultProcessor
446446
{
447447
type Out = Vec<(Vec<u8>, Vec<Range<Key>>)>;
448448

@@ -522,9 +522,9 @@ mod test {
522522

523523
use crate::{
524524
backoff::{DEFAULT_REGION_BACKOFF, OPTIMISTIC_BACKOFF},
525-
Key,
526525
mock::{MockKvClient, MockPdClient},
527526
request::Plan,
527+
Key,
528528
};
529529

530530
use super::*;

src/request/codec.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use tikv_client_common::Error;
2-
use tikv_client_proto::kvrpcpb;
3-
use tikv_client_proto::metapb::Region;
2+
use tikv_client_proto::{kvrpcpb, metapb::Region};
43

5-
use crate::{Key, kv::codec::decode_bytes_in_place, Result};
4+
use crate::{kv::codec::decode_bytes_in_place, Key, Result};
65

76
const RAW_MODE_PREFIX: u8 = b'r';
87
const TXN_MODE_PREFIX: u8 = b'x';
@@ -26,7 +25,9 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
2625
keys
2726
}
2827

29-
fn encode_pairs(&self, pairs: Vec<kvrpcpb::KvPair>) -> Vec<kvrpcpb::KvPair> { pairs }
28+
fn encode_pairs(&self, pairs: Vec<kvrpcpb::KvPair>) -> Vec<kvrpcpb::KvPair> {
29+
pairs
30+
}
3031

3132
fn decode_key(&self, key: Vec<u8>) -> Result<Vec<u8>> {
3233
Ok(key)
@@ -40,7 +41,9 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
4041
(start, end)
4142
}
4243

43-
fn encode_ranges(&self, ranges: Vec<kvrpcpb::KeyRange>) -> Vec<kvrpcpb::KeyRange> { ranges }
44+
fn encode_ranges(&self, ranges: Vec<kvrpcpb::KeyRange>) -> Vec<kvrpcpb::KeyRange> {
45+
ranges
46+
}
4447

4548
fn encode_pd_query(&self, key: Vec<u8>) -> Vec<u8> {
4649
key
@@ -204,16 +207,14 @@ impl RequestCodec for KeySpaceCodec {
204207
if region.get_start_key() < self.mode.min_key().as_slice() {
205208
*region.mut_start_key() = vec![];
206209
} else {
207-
*region.mut_start_key() = self
208-
.decode_key(region.get_start_key().to_vec())?;
210+
*region.mut_start_key() = self.decode_key(region.get_start_key().to_vec())?;
209211
}
210212

211213
// Map the region's end key to the keyspace's end key.
212214
if region.get_end_key() > self.mode.max_key().as_slice() {
213215
*region.mut_end_key() = vec![];
214216
} else {
215-
*region.mut_end_key() = self
216-
.decode_key(region.get_end_key().to_vec())?;
217+
*region.mut_end_key() = self.decode_key(region.get_end_key().to_vec())?;
217218
}
218219

219220
Ok(region)

src/request/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use crate::{
1111
backoff::{Backoff, DEFAULT_REGION_BACKOFF, OPTIMISTIC_BACKOFF, PESSIMISTIC_BACKOFF},
1212
transaction::HasLocks,
1313
};
14-
use crate::request::codec::RequestCodec;
1514

1615
pub use self::{
1716
plan::{
@@ -56,6 +55,7 @@ macro_rules! impl_kv_request_for_single_key_op {
5655
return Cow::Borrowed(self);
5756
}
5857
let mut req = self.clone();
58+
5959
*req.mut_key() = codec.encode_key(req.take_key());
6060

6161
Cow::Owned(req)

src/transaction/requests.rs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use crate::{
1414
collect_first,
1515
pd::PdClient,
1616
request::{
17-
codec::RequestCodec, Collect, CollectSingle, CollectWithShard, DefaultProcessor,
18-
KvRequest, Merge, Process, ResponseWithShard, Shardable, SingleKey,
17+
codec::RequestCodec, Collect, CollectSingle, CollectWithShard, DefaultProcessor, KvRequest,
18+
Merge, Process, ResponseWithShard, Shardable, SingleKey,
1919
},
2020
store::{store_stream_for_keys, store_stream_for_range_by_start_key, RegionStore},
2121
timestamp::TimestampExt,
@@ -278,7 +278,10 @@ pub fn new_batch_rollback_request(
278278
req
279279
}
280280

281-
impl_kv_request_for_single_key_op!(kvrpcpb::BatchRollbackRequest, kvrpcpb::BatchRollbackResponse);
281+
impl_kv_request_for_single_key_op!(
282+
kvrpcpb::BatchRollbackRequest,
283+
kvrpcpb::BatchRollbackResponse
284+
);
282285
shardable_keys!(kvrpcpb::BatchRollbackRequest);
283286

284287
pub fn new_pessimistic_rollback_request(
@@ -294,7 +297,10 @@ pub fn new_pessimistic_rollback_request(
294297
req
295298
}
296299

297-
impl_kv_request_for_single_key_op!(kvrpcpb::PessimisticRollbackRequest, kvrpcpb::PessimisticRollbackResponse);
300+
impl_kv_request_for_single_key_op!(
301+
kvrpcpb::PessimisticRollbackRequest,
302+
kvrpcpb::PessimisticRollbackResponse
303+
);
298304
shardable_keys!(kvrpcpb::PessimisticRollbackRequest);
299305

300306
pub fn new_pessimistic_lock_request(
@@ -322,7 +328,10 @@ pub fn new_pessimistic_lock_request(
322328
req
323329
}
324330

325-
impl_kv_request_for_single_key_op!(kvrpcpb::PessimisticLockRequest, kvrpcpb::PessimisticLockResponse);
331+
impl_kv_request_for_single_key_op!(
332+
kvrpcpb::PessimisticLockRequest,
333+
kvrpcpb::PessimisticLockResponse
334+
);
326335

327336
impl Shardable for kvrpcpb::PessimisticLockRequest {
328337
type Shard = Vec<kvrpcpb::Mutation>;
@@ -496,7 +505,10 @@ impl Process<kvrpcpb::TxnHeartBeatResponse> for DefaultProcessor {
496505
}
497506
}
498507

499-
impl_kv_request_for_single_key_op!(kvrpcpb::CheckTxnStatusRequest, kvrpcpb::CheckTxnStatusResponse);
508+
impl_kv_request_for_single_key_op!(
509+
kvrpcpb::CheckTxnStatusRequest,
510+
kvrpcpb::CheckTxnStatusResponse
511+
);
500512

501513
impl Shardable for kvrpcpb::CheckTxnStatusRequest {
502514
type Shard = Vec<Vec<u8>>;
@@ -563,7 +575,10 @@ impl From<(u64, u64, Option<kvrpcpb::LockInfo>)> for TransactionStatusKind {
563575
}
564576
}
565577

566-
impl_kv_request_for_single_key_op!(kvrpcpb::CheckSecondaryLocksRequest, kvrpcpb::CheckSecondaryLocksResponse);
578+
impl_kv_request_for_single_key_op!(
579+
kvrpcpb::CheckSecondaryLocksRequest,
580+
kvrpcpb::CheckSecondaryLocksResponse
581+
);
567582
shardable_keys!(kvrpcpb::CheckSecondaryLocksRequest);
568583

569584
impl Merge<kvrpcpb::CheckSecondaryLocksResponse> for Collect {

0 commit comments

Comments
 (0)