diff --git a/src/generated/autoid.rs b/src/generated/autoid.rs index b53d98de..503024ab 100644 --- a/src/generated/autoid.rs +++ b/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 { diff --git a/src/generated/backup.rs b/src/generated/backup.rs index 40829e75..a283075f 100644 --- a/src/generated/backup.rs +++ b/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)] diff --git a/src/generated/cdcpb.rs b/src/generated/cdcpb.rs index 3d39f669..e80572e2 100644 --- a/src/generated/cdcpb.rs +++ b/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 { diff --git a/src/generated/configpb.rs b/src/generated/configpb.rs index 48886295..58f3c345 100644 --- a/src/generated/configpb.rs +++ b/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 { diff --git a/src/generated/coprocessor.rs b/src/generated/coprocessor.rs index ae102007..907f9697 100644 --- a/src/generated/coprocessor.rs +++ b/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)] diff --git a/src/generated/deadlock.rs b/src/generated/deadlock.rs index ed760b98..ef9c61e3 100644 --- a/src/generated/deadlock.rs +++ b/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 {} diff --git a/src/generated/debugpb.rs b/src/generated/debugpb.rs index 4b1af89e..dbe0d3e1 100644 --- a/src/generated/debugpb.rs +++ b/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 { diff --git a/src/generated/diagnosticspb.rs b/src/generated/diagnosticspb.rs index 9127e734..edb1dd45 100644 --- a/src/generated/diagnosticspb.rs +++ b/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 { diff --git a/src/generated/disaggregated.rs b/src/generated/disaggregated.rs index 768a3f8c..0b24ba7a 100644 --- a/src/generated/disaggregated.rs +++ b/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 { diff --git a/src/generated/disk_usage.rs b/src/generated/disk_usage.rs index 6f4292af..4b2c1fc5 100644 --- a/src/generated/disk_usage.rs +++ b/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 { diff --git a/src/generated/encryptionpb.rs b/src/generated/encryptionpb.rs index 90e33961..f7d7a924 100644 --- a/src/generated/encryptionpb.rs +++ b/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)] diff --git a/src/generated/enginepb.rs b/src/generated/enginepb.rs index 486cefec..b0841074 100644 --- a/src/generated/enginepb.rs +++ b/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 { diff --git a/src/generated/eraftpb.rs b/src/generated/eraftpb.rs index 80f48417..6724cb25 100644 --- a/src/generated/eraftpb.rs +++ b/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. /// diff --git a/src/generated/errorpb.rs b/src/generated/errorpb.rs index 7796202a..4ed789b0 100644 --- a/src/generated/errorpb.rs +++ b/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)] diff --git a/src/generated/gcpb.rs b/src/generated/gcpb.rs index 6918bf6b..ef87aeb3 100644 --- a/src/generated/gcpb.rs +++ b/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 { diff --git a/src/generated/google.api.rs b/src/generated/google.api.rs index 76cd3321..bb9f7204 100644 --- a/src/generated/google.api.rs +++ b/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. diff --git a/src/generated/import_kvpb.rs b/src/generated/import_kvpb.rs index 7c681ad2..104b4346 100644 --- a/src/generated/import_kvpb.rs +++ b/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 { diff --git a/src/generated/import_sstpb.rs b/src/generated/import_sstpb.rs index 27c904ad..4f8a1274 100644 --- a/src/generated/import_sstpb.rs +++ b/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 { diff --git a/src/generated/keyspacepb.rs b/src/generated/keyspacepb.rs index 59ec12bd..3cf798d9 100644 --- a/src/generated/keyspacepb.rs +++ b/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 { diff --git a/src/generated/kvrpcpb.rs b/src/generated/kvrpcpb.rs index a37dce1a..ec039123 100644 --- a/src/generated/kvrpcpb.rs +++ b/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)] diff --git a/src/generated/logbackup.rs b/src/generated/logbackup.rs index a1805cca..51b3cf5f 100644 --- a/src/generated/logbackup.rs +++ b/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)] diff --git a/src/generated/meta_storagepb.rs b/src/generated/meta_storagepb.rs index 2f8f28ba..1355ebd6 100644 --- a/src/generated/meta_storagepb.rs +++ b/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 { diff --git a/src/generated/metapb.rs b/src/generated/metapb.rs index 4d5cd61d..8839fb0f 100644 --- a/src/generated/metapb.rs +++ b/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 { diff --git a/src/generated/mod.rs b/src/generated/mod.rs index e92df997..da3c98ea 100644 --- a/src/generated/mod.rs +++ b/src/generated/mod.rs @@ -1,3 +1,4 @@ +// This file is @generated by prost-build. pub mod autoid { include!("autoid.rs"); } diff --git a/src/generated/mpp.rs b/src/generated/mpp.rs index cfce201c..e68ab94b 100644 --- a/src/generated/mpp.rs +++ b/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)] diff --git a/src/generated/pdpb.rs b/src/generated/pdpb.rs index d27a1d0d..548b333c 100644 --- a/src/generated/pdpb.rs +++ b/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 { diff --git a/src/generated/raft_cmdpb.rs b/src/generated/raft_cmdpb.rs index 882714a2..eb178070 100644 --- a/src/generated/raft_cmdpb.rs +++ b/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 { diff --git a/src/generated/raft_serverpb.rs b/src/generated/raft_serverpb.rs index b8ade3a5..f6b1f942 100644 --- a/src/generated/raft_serverpb.rs +++ b/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 { diff --git a/src/generated/recover_data.rs b/src/generated/recover_data.rs index 3d05ab44..3b7adb0f 100644 --- a/src/generated/recover_data.rs +++ b/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)] diff --git a/src/generated/replication_modepb.rs b/src/generated/replication_modepb.rs index 867712ea..3140fab5 100644 --- a/src/generated/replication_modepb.rs +++ b/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)] diff --git a/src/generated/resource_manager.rs b/src/generated/resource_manager.rs index 72251020..caf4b116 100644 --- a/src/generated/resource_manager.rs +++ b/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 {} diff --git a/src/generated/resource_usage_agent.rs b/src/generated/resource_usage_agent.rs index 9aff2a7e..a8f7f5fd 100644 --- a/src/generated/resource_usage_agent.rs +++ b/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 {} diff --git a/src/generated/schedulingpb.rs b/src/generated/schedulingpb.rs index 2a53089c..5c6d5de3 100644 --- a/src/generated/schedulingpb.rs +++ b/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 { diff --git a/src/generated/tikvpb.rs b/src/generated/tikvpb.rs index a28e5270..e27b1cbf 100644 --- a/src/generated/tikvpb.rs +++ b/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 { diff --git a/src/generated/tracepb.rs b/src/generated/tracepb.rs index 4ca11d10..51a01547 100644 --- a/src/generated/tracepb.rs +++ b/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 {} diff --git a/src/generated/tsopb.rs b/src/generated/tsopb.rs index 5ce1591a..61a3c6f5 100644 --- a/src/generated/tsopb.rs +++ b/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 { diff --git a/src/pd/cluster.rs b/src/pd/cluster.rs index e74a78fb..f723f8f7 100644 --- a/src/pd/cluster.rs +++ b/src/pd/cluster.rs @@ -49,7 +49,7 @@ impl Cluster { timeout: Duration, ) -> Result { 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 { 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 diff --git a/src/raw/requests.rs b/src/raw/requests.rs index 8c49da9e..201ac657 100644 --- a/src/raw/requests.rs +++ b/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(()) } diff --git a/src/region_cache.rs b/src/region_cache.rs index 3a5c0a25..e56068c0 100644 --- a/src/region_cache.rs +++ b/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)); } } diff --git a/src/store/mod.rs b/src/store/mod.rs index a244a1bc..f21373b4 100644 --- a/src/store/mod.rs +++ b/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, } -#[async_trait] -pub trait KvConnectStore: KvConnect { - async fn connect_to_store( - &self, - region: RegionWithLeader, - address: String, - ) -> Result { - 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( key_data: impl Iterator + Send + Sync + 'static, diff --git a/src/transaction/buffer.rs b/src/transaction/buffer.rs index 7090ebd4..be88ce85 100644 --- a/src/transaction/buffer.rs +++ b/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(), };