Merge pull request #42 from nrc/prost

Migrate to Prost

Author: nrc

Cargo.toml

@@ -24,15 +24,13 @@ fxhash = "0.2"
 grpcio = { version = "0.5.0-alpha", features = [ "secure", "prost-codec" ], default-features = false }
 lazy_static = "0.2.1"
 log = "0.3.9"
-protobuf = "2"
 serde = "1.0"
 serde_derive = "1.0"
 tokio-core = "0.1"
 tokio-timer = "0.2"
 
 [dependencies.kvproto]
 git = "https://github.com/pingcap/kvproto.git"
-branch  = "raft-0.5.0"
 
 [dependencies.prometheus]
 version = "0.4.2"

src/rpc/client.rs

@@ -18,7 +18,6 @@ use futures::{
 use grpcio::{EnvBuilder, Environment};
 use kvproto::kvrpcpb;
 use log::*;
-use protobuf::Message;
 
 use crate::{
     raw::ColumnFamily,
@@ -478,7 +477,7 @@ impl RegionContext {
 
 impl From<RegionContext> for kvrpcpb::Context {
     fn from(mut ctx: RegionContext) -> kvrpcpb::Context {
-        let mut kvctx = kvrpcpb::Context::new();
+        let mut kvctx = kvrpcpb::Context::default();
         kvctx.set_region_id(ctx.region.id);
         kvctx.set_region_epoch(ctx.region.take_region_epoch());
         kvctx.set_peer(ctx.region.peer().expect("leader must exist").into_inner());

src/rpc/pd/leader.rs

@@ -17,7 +17,6 @@ use fxhash::FxHashSet as HashSet;
 use grpcio::{CallOption, Environment, WriteFlags};
 use kvproto::pdpb;
 use log::*;
-use protobuf::Message;
 use tokio_core::reactor::{Core, Handle as OtherHandle};
 
 use crate::{
@@ -34,9 +33,8 @@ use crate::{
 
 macro_rules! pd_request {
     ($cluster_id:expr, $type:ty) => {{
-        use ::protobuf::Message;
-        let mut request = <$type>::new();
-        let mut header = ::kvproto::pdpb::RequestHeader::new();
+        let mut request = <$type>::default();
+        let mut header = ::kvproto::pdpb::RequestHeader::default();
         header.set_cluster_id($cluster_id);
         request.set_header(header);
         request
@@ -354,7 +352,7 @@ fn connect(
     let client = security_mgr.connect(env, addr, pdpb::PdClient::new)?;
     let option = CallOption::default().timeout(timeout);
     let resp = client
-        .get_members_opt(&pdpb::GetMembersRequest::new(), option)
+        .get_members_opt(&pdpb::GetMembersRequest::default(), option)
         .map_err(Error::from)?;
     Ok((client, resp))
 }

src/rpc/tikv/client.rs

@@ -8,7 +8,6 @@ use std::{fmt, sync::Arc, time::Duration};
 use futures::Future;
 use grpcio::{CallOption, Environment};
 use kvproto::{errorpb, kvrpcpb, tikvpb::TikvClient};
-use protobuf::{self, Message};
 
 use crate::{
     rpc::{
@@ -160,7 +159,7 @@ has_no_error!(kvrpcpb::RawBatchScanResponse);
 
 macro_rules! raw_request {
     ($context:expr, $type:ty) => {{
-        let mut req = <$type>::new();
+        let mut req = <$type>::default();
         let (region, cf) = $context.into_inner();
         req.set_context(region.into());
         if let Some(cf) = cf {
@@ -172,15 +171,15 @@ macro_rules! raw_request {
 
 macro_rules! txn_request {
     ($context:expr, $type:ty) => {{
-        let mut req = <$type>::new();
+        let mut req = <$type>::default();
         req.set_context($context.into_inner().into());
         req
     }};
 }
 
 impl From<Mutation> for kvrpcpb::Mutation {
     fn from(mutation: Mutation) -> kvrpcpb::Mutation {
-        let mut pb = kvrpcpb::Mutation::new();
+        let mut pb = kvrpcpb::Mutation::default();
         match mutation {
             Mutation::Put(k, v) => {
                 pb.set_op(kvrpcpb::Op::Put);
@@ -206,7 +205,7 @@ impl From<Mutation> for kvrpcpb::Mutation {
 
 impl From<TxnInfo> for kvrpcpb::TxnInfo {
     fn from(txn_info: TxnInfo) -> kvrpcpb::TxnInfo {
-        let mut pb = kvrpcpb::TxnInfo::new();
+        let mut pb = kvrpcpb::TxnInfo::default();
         pb.set_txn(txn_info.txn);
         pb.set_status(txn_info.status);
         pb
@@ -317,7 +316,7 @@ impl KvClient {
         mutations: impl Iterator<Item = Mutation>,
         commit_version: u64,
     ) -> impl Future<Item = kvrpcpb::ImportResponse, Error = Error> {
-        let mut req = kvrpcpb::ImportRequest::new();
+        let mut req = kvrpcpb::ImportRequest::default();
         req.set_mutations(mutations.map(Into::into).collect());
         req.set_commit_version(commit_version);
 
@@ -624,7 +623,7 @@ impl KvClient {
 
     #[inline]
     fn convert_to_grpc_pair(pair: KvPair) -> kvrpcpb::KvPair {
-        let mut result = kvrpcpb::KvPair::new();
+        let mut result = kvrpcpb::KvPair::default();
         let (key, value) = pair.into_inner();
         result.set_key(key.into_inner());
         result.set_value(value.into_inner());
@@ -652,7 +651,7 @@ impl KvClient {
     #[inline]
     fn convert_to_grpc_range(range: (Option<Key>, Option<Key>)) -> kvrpcpb::KeyRange {
         let (start, end) = range;
-        let mut range = kvrpcpb::KeyRange::new();
+        let mut range = kvrpcpb::KeyRange::default();
         start.map(|k| range.set_start_key(k.into_inner())).unwrap();
         end.map(|k| range.set_end_key(k.into_inner())).unwrap();
         range