From bb26361c9f668704acb718bd7982585a7fa76f8d Mon Sep 17 00:00:00 2001
From: haojinming <jinming.hao@pingcap.com>
Date: Tue, 3 Jan 2023 10:28:55 +0800
Subject: [PATCH] fix compile issue

Signed-off-by: haojinming <jinming.hao@pingcap.com>
---
 src/request/plan.rs       | 2 +-
 src/transaction/client.rs | 5 ++---
 src/transaction/lock.rs   | 2 +-
 tests/failpoint_tests.rs  | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/request/plan.rs b/src/request/plan.rs
index 78d4776..6681724 100644
--- a/src/request/plan.rs
+++ b/src/request/plan.rs
@@ -502,7 +502,7 @@ impl<P: Plan, PdC: PdClient> Clone for CleanupLocks<P, PdC> {
             logger: self.logger.clone(),
             inner: self.inner.clone(),
             ctx: self.ctx.clone(),
-            options: self.options,
+            options: self.options.clone(),
             store: None,
             pd_client: self.pd_client.clone(),
             backoff: self.backoff.clone(),
diff --git a/src/transaction/client.rs b/src/transaction/client.rs
index f4f1983..3d749a9 100644
--- a/src/transaction/client.rs
+++ b/src/transaction/client.rs
@@ -13,7 +13,7 @@ use crate::{
     Backoff, Result,
 };
 use slog::{Drain, Logger};
-use std::{mem, sync::Arc};
+use std::sync::Arc;
 use tikv_client_proto::pdpb::Timestamp;
 
 // FIXME: cargo-culted value
@@ -263,7 +263,6 @@ impl Client {
     ) -> Result<CleanupLocksResult> {
         debug!(self.logger, "invoking cleanup async commit locks");
         // scan all locks with ts <= safepoint
-        let mut start_key = vec![];
         let ctx = ResolveLocksContext::default();
         let backoff = Backoff::equal_jitter_backoff(100, 10000, 50);
         let req = new_scan_lock_request(
@@ -291,7 +290,7 @@ impl Client {
         batch_size: u32,
     ) -> Result<Vec<tikv_client_proto::kvrpcpb::LockInfo>> {
         let req = new_scan_lock_request(
-            mem::take(&mut start_key),
+            std::mem::take(&mut start_key),
             vec![],
             safepoint.version(),
             batch_size,
diff --git a/src/transaction/lock.rs b/src/transaction/lock.rs
index 516d66b..0e98f7c 100644
--- a/src/transaction/lock.rs
+++ b/src/transaction/lock.rs
@@ -149,7 +149,7 @@ pub struct ResolveLocksContext {
     pub(crate) clean_regions: Arc<RwLock<HashMap<u64, HashSet<RegionVerId>>>>,
 }
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Debug)]
 pub struct ResolveLocksOptions {
     pub async_commit_only: bool,
     pub start_key: Vec<u8>,
diff --git a/tests/failpoint_tests.rs b/tests/failpoint_tests.rs
index fcba93c..d9f6369 100644
--- a/tests/failpoint_tests.rs
+++ b/tests/failpoint_tests.rs
@@ -99,6 +99,7 @@ async fn txn_cleanup_locks_batch_size() -> Result<()> {
     let options = ResolveLocksOptions {
         async_commit_only: false,
         batch_size: 4,
+        ..Default::default()
     };
     let res = client.cleanup_locks(&safepoint, options).await?;