Skip to content

Commit 521a7d4

Browse files
authored
Merge branch 'master' into mods
2 parents b39056f + 0b965dd commit 521a7d4

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ name = "tikv_client"
2121
failure = "0.1"
2222
futures = "0.1"
2323
fxhash = "0.2"
24-
grpcio = { version = "0.4", features = [ "secure" ] }
24+
grpcio = { version = "0.5.0-alpha", features = [ "secure", "prost-codec" ], default-features = false }
2525
lazy_static = "0.2.1"
2626
log = "0.3.9"
27-
protobuf = "~2.0"
27+
protobuf = "2"
2828
serde = "1.0"
2929
serde_derive = "1.0"
3030
tokio-core = "0.1"

src/errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ pub struct Error {
1212

1313
/// An error originating from the TiKV client or dependencies.
1414
#[derive(Debug, Fail)]
15+
#[allow(clippy::large_enum_variant)]
1516
pub enum ErrorKind {
1617
/// Wraps a `std::io::Error`.
1718
#[fail(display = "IO error: {}", _0)]

src/rpc/client.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use futures::{
1818
use grpcio::{EnvBuilder, Environment};
1919
use kvproto::kvrpcpb;
2020
use log::*;
21+
use protobuf::Message;
2122

2223
use crate::{
2324
raw::ColumnFamily,

src/rpc/pd/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88

99
use futures::Future;
1010
use grpcio::{CallOption, Environment};
11-
use kvproto::{metapb, pdpb, pdpb_grpc::PdClient as RpcClient};
11+
use kvproto::{metapb, pdpb, pdpb::PdClient as RpcClient};
1212

1313
use crate::{
1414
rpc::{
@@ -106,7 +106,7 @@ impl PdClient {
106106
&self,
107107
region_id: u64,
108108
) -> impl Future<Item = (metapb::Region, Option<metapb::Peer>), Error = Error> {
109-
let mut req = pd_request!(self.cluster_id, pdpb::GetRegionByIDRequest);
109+
let mut req = pd_request!(self.cluster_id, pdpb::GetRegionByIdRequest);
110110
req.set_region_id(region_id);
111111

112112
self.execute(request_context(

src/rpc/pd/leader.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ use futures::{
1515
};
1616
use fxhash::FxHashSet as HashSet;
1717
use grpcio::{CallOption, Environment, WriteFlags};
18-
use kvproto::{pdpb, pdpb_grpc};
18+
use kvproto::pdpb;
1919
use log::*;
20+
use protobuf::Message;
2021
use tokio_core::reactor::{Core, Handle as OtherHandle};
2122

2223
use crate::{
@@ -33,6 +34,7 @@ use crate::{
3334

3435
macro_rules! pd_request {
3536
($cluster_id:expr, $type:ty) => {{
37+
use ::protobuf::Message;
3638
let mut request = <$type>::new();
3739
let mut header = ::kvproto::pdpb::RequestHeader::new();
3840
header.set_cluster_id($cluster_id);
@@ -214,7 +216,7 @@ impl PdReactor {
214216
}
215217

216218
pub struct LeaderClient {
217-
pub client: pdpb_grpc::PdClient,
219+
pub client: pdpb::PdClient,
218220
pub members: pdpb::GetMembersResponse,
219221

220222
env: Arc<Environment>,
@@ -293,7 +295,7 @@ pub fn validate_endpoints(
293295
endpoints: &[String],
294296
security_mgr: &SecurityManager,
295297
timeout: Duration,
296-
) -> Result<(pdpb_grpc::PdClient, pdpb::GetMembersResponse)> {
298+
) -> Result<(pdpb::PdClient, pdpb::GetMembersResponse)> {
297299
let len = endpoints.len();
298300
let mut endpoints_set = HashSet::with_capacity_and_hasher(len, Default::default());
299301

@@ -348,8 +350,8 @@ fn connect(
348350
security_mgr: &SecurityManager,
349351
addr: &str,
350352
timeout: Duration,
351-
) -> Result<(pdpb_grpc::PdClient, pdpb::GetMembersResponse)> {
352-
let client = security_mgr.connect(env, addr, pdpb_grpc::PdClient::new)?;
353+
) -> Result<(pdpb::PdClient, pdpb::GetMembersResponse)> {
354+
let client = security_mgr.connect(env, addr, pdpb::PdClient::new)?;
353355
let option = CallOption::default().timeout(timeout);
354356
let resp = client
355357
.get_members_opt(&pdpb::GetMembersRequest::new(), option)
@@ -363,7 +365,7 @@ fn try_connect(
363365
addr: &str,
364366
cluster_id: u64,
365367
timeout: Duration,
366-
) -> Result<(pdpb_grpc::PdClient, pdpb::GetMembersResponse)> {
368+
) -> Result<(pdpb::PdClient, pdpb::GetMembersResponse)> {
367369
let (client, r) = connect(Arc::clone(&env), security_mgr, addr, timeout)?;
368370
let new_cluster_id = r.get_header().get_cluster_id();
369371
if new_cluster_id != cluster_id {
@@ -383,7 +385,7 @@ pub fn try_connect_leader(
383385
security_mgr: &SecurityManager,
384386
previous: &pdpb::GetMembersResponse,
385387
timeout: Duration,
386-
) -> Result<(pdpb_grpc::PdClient, pdpb::GetMembersResponse)> {
388+
) -> Result<(pdpb::PdClient, pdpb::GetMembersResponse)> {
387389
let previous_leader = previous.get_leader();
388390
let members = previous.get_members();
389391
let cluster_id = previous.get_header().get_cluster_id();

src/rpc/tikv/client.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use std::{fmt, sync::Arc, time::Duration};
77

88
use futures::Future;
99
use grpcio::{CallOption, Environment};
10-
use kvproto::{errorpb, kvrpcpb, tikvpb_grpc::TikvClient};
11-
use protobuf;
10+
use kvproto::{errorpb, kvrpcpb, tikvpb::TikvClient};
11+
use protobuf::{self, Message};
1212

1313
use crate::{
1414
rpc::{
@@ -84,7 +84,7 @@ has_region_error!(kvrpcpb::CleanupResponse);
8484
has_region_error!(kvrpcpb::BatchGetResponse);
8585
has_region_error!(kvrpcpb::ScanLockResponse);
8686
has_region_error!(kvrpcpb::ResolveLockResponse);
87-
has_region_error!(kvrpcpb::GCResponse);
87+
has_region_error!(kvrpcpb::GcResponse);
8888
has_region_error!(kvrpcpb::RawGetResponse);
8989
has_region_error!(kvrpcpb::RawBatchGetResponse);
9090
has_region_error!(kvrpcpb::RawPutResponse);
@@ -116,7 +116,7 @@ has_key_error!(kvrpcpb::BatchRollbackResponse);
116116
has_key_error!(kvrpcpb::CleanupResponse);
117117
has_key_error!(kvrpcpb::ScanLockResponse);
118118
has_key_error!(kvrpcpb::ResolveLockResponse);
119-
has_key_error!(kvrpcpb::GCResponse);
119+
has_key_error!(kvrpcpb::GcResponse);
120120

121121
macro_rules! has_str_error {
122122
($type:ty) => {
@@ -415,8 +415,8 @@ impl KvClient {
415415
&self,
416416
context: TxnContext,
417417
safe_point: u64,
418-
) -> impl Future<Item = kvrpcpb::GCResponse, Error = Error> {
419-
let mut req = txn_request!(context, kvrpcpb::GCRequest);
418+
) -> impl Future<Item = kvrpcpb::GcResponse, Error = Error> {
419+
let mut req = txn_request!(context, kvrpcpb::GcRequest);
420420
req.set_safe_point(safe_point);
421421

422422
self.execute(request_context(
@@ -632,7 +632,7 @@ impl KvClient {
632632
}
633633

634634
#[inline]
635-
fn convert_to_grpc_pairs(pairs: Vec<KvPair>) -> protobuf::RepeatedField<kvrpcpb::KvPair> {
635+
fn convert_to_grpc_pairs(pairs: Vec<KvPair>) -> Vec<kvrpcpb::KvPair> {
636636
pairs.into_iter().map(Self::convert_to_grpc_pair).collect()
637637
}
638638

@@ -642,9 +642,8 @@ impl KvClient {
642642
}
643643

644644
#[inline]
645-
fn convert_from_grpc_pairs(pairs: protobuf::RepeatedField<kvrpcpb::KvPair>) -> Vec<KvPair> {
645+
fn convert_from_grpc_pairs(pairs: Vec<kvrpcpb::KvPair>) -> Vec<KvPair> {
646646
pairs
647-
.into_vec()
648647
.into_iter()
649648
.map(Self::convert_from_grpc_pair)
650649
.collect()
@@ -662,7 +661,7 @@ impl KvClient {
662661
#[inline]
663662
fn convert_to_grpc_ranges(
664663
ranges: impl Iterator<Item = (Option<Key>, Option<Key>)>,
665-
) -> protobuf::RepeatedField<kvrpcpb::KeyRange> {
664+
) -> Vec<kvrpcpb::KeyRange> {
666665
ranges.map(Self::convert_to_grpc_range).collect()
667666
}
668667
}

0 commit comments

Comments
 (0)