Merge branch 'master' into handle-pd-get-member-with-err

src/generated/autoid.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AutoIdRequest {

src/generated/backup.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// The message save the metadata of a backup.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/cdcpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Header {

src/generated/configpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Status {

src/generated/coprocessor.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// \[start, end)
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/deadlock.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WaitForEntriesRequest {}

src/generated/debugpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetRequest {

src/generated/diagnosticspb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SearchLogRequest {

src/generated/disaggregated.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct S3LockResult {

src/generated/disk_usage.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum DiskUsage {

src/generated/encryptionpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// General encryption metadata for any data type.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/enginepb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CommandRequestHeader {

src/generated/eraftpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// The entry is a type of change that needs to be applied. It contains two data fields.
 /// While the fields are built into the model; their usage is determined by the entry_type.
 ///

src/generated/errorpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// NotLeader is the error variant that tells a request be handle by raft leader
 /// is sent to raft follower or learner.
 #[allow(clippy::derive_partial_eq_without_eq)]

src/generated/gcpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestHeader {

src/generated/google.api.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// Defines the HTTP configuration for an API service. It contains a list of
 /// \[HttpRule\]\[google.api.HttpRule\], each specifying the mapping of an RPC method
 /// to one or more HTTP REST API methods.

src/generated/import_kvpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SwitchModeRequest {

src/generated/import_sstpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SuspendImportRpcRequest {

src/generated/keyspacepb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct KeyspaceMeta {

src/generated/kvrpcpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// A transactional get command. Lookup a value for `key` in the transaction with
 /// starting timestamp = `version`.
 #[allow(clippy::derive_partial_eq_without_eq)]

src/generated/logbackup.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// The minimal information for identify a region.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/meta_storagepb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Error {

src/generated/metapb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Cluster {

src/generated/mod.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 pub mod autoid {
     include!("autoid.rs");
 }

src/generated/mpp.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// TaskMeta contains meta of a mpp plan, including query's ts and task address.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/pdpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct WatchGlobalConfigRequest {

src/generated/raft_cmdpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct GetRequest {

src/generated/raft_serverpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RaftMessage {

src/generated/recover_data.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// request to read region meata from a store
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/replication_modepb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// The replication status sync from PD to TiKV.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

src/generated/resource_manager.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ListResourceGroupsRequest {}

src/generated/resource_usage_agent.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ResourceMeteringRequest {}

src/generated/schedulingpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestHeader {

src/generated/tikvpb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BatchCommandsRequest {

src/generated/tracepb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TraceRecordRequest {}

src/generated/tsopb.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestHeader {

src/pd/cluster.rs

@@ -49,7 +49,7 @@ impl Cluster {
         timeout: Duration,
     ) -> Result<pdpb::GetRegionResponse> {
         let mut req = pd_request!(self.id, pdpb::GetRegionRequest);
-        req.region_key = key.clone();
+        req.region_key = key;
         req.send(&mut self.client, timeout).await
     }
 
@@ -101,7 +101,7 @@ impl Cluster {
         timeout: Duration,
     ) -> Result<keyspacepb::KeyspaceMeta> {
         let mut req = pd_request!(self.id, keyspacepb::LoadKeyspaceRequest);
-        req.name = keyspace.to_owned();
+        req.name = keyspace.to_string();
         let resp = req.send(&mut self.keyspace_client, timeout).await?;
         let keyspace = resp
             .keyspace

src/raw/requests.rs

@@ -472,7 +472,7 @@ impl Shardable for RawCoprocessorRequest {
 
     fn apply_shard(&mut self, shard: Self::Shard, store: &RegionStore) -> Result<()> {
         self.set_leader(&store.region_with_leader)?;
-        self.inner.ranges = shard.clone();
+        self.inner.ranges.clone_from(&shard);
         self.inner.data = (self.data_builder)(store.region_with_leader.region.clone(), shard);
         Ok(())
     }

src/region_cache.rs

@@ -575,10 +575,10 @@ mod test {
         });
         assert!(!is_valid_tikv_store(&store));
 
-        store.labels[1].value = "tiflash_compute".to_owned();
+        store.labels[1].value = "tiflash_compute".to_string();
         assert!(!is_valid_tikv_store(&store));
 
-        store.labels[1].value = "other".to_owned();
+        store.labels[1].value = "other".to_string();
         assert!(is_valid_tikv_store(&store));
     }
 }

src/store/mod.rs

@@ -8,7 +8,6 @@ use std::cmp::max;
 use std::cmp::min;
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use derive_new::new;
 use futures::prelude::*;
 use futures::stream::BoxStream;
@@ -38,21 +37,6 @@ pub struct Store {
     pub client: Arc<dyn KvClient + Send + Sync>,
 }
 
-#[async_trait]
-pub trait KvConnectStore: KvConnect {
-    async fn connect_to_store(
-        &self,
-        region: RegionWithLeader,
-        address: String,
-    ) -> Result<RegionStore> {
-        log::info!("connect to tikv endpoint: {:?}", &address);
-        let client = self.connect(address.as_str()).await?;
-        Ok(RegionStore::new(region, Arc::new(client)))
-    }
-}
-
-impl KvConnectStore for TikvConnect {}
-
 /// Maps keys to a stream of stores. `key_data` must be sorted in increasing order
 pub fn store_stream_for_keys<K, KOut, PdC>(
     key_data: impl Iterator<Item = K> + Send + Sync + 'static,

src/transaction/buffer.rs

@@ -358,13 +358,13 @@ impl BufferEntry {
             BufferEntry::Cached(_) => return None,
             BufferEntry::Put(v) => {
                 pb.op = kvrpcpb::Op::Put.into();
-                pb.value = v.clone();
+                pb.value.clone_from(v);
             }
             BufferEntry::Del => pb.op = kvrpcpb::Op::Del.into(),
             BufferEntry::Locked(_) => pb.op = kvrpcpb::Op::Lock.into(),
             BufferEntry::Insert(v) => {
                 pb.op = kvrpcpb::Op::Insert.into();
-                pb.value = v.clone();
+                pb.value.clone_from(v);
             }
             BufferEntry::CheckNotExist => pb.op = kvrpcpb::Op::CheckNotExists.into(),
         };