resolve conflicts

Signed-off-by: Yu Juncen <yu745514916@live.com>

Cargo.toml

@@ -365,7 +365,7 @@ raft = { version = "0.7.0", default-features = false, features = ["protobuf-code
 grpcio = { version = "0.10.4", default-features = false, features = ["openssl-vendored", "protobuf-codec", "nightly"] }
 grpcio-health = { version = "0.10.4", default-features = false, features = ["protobuf-codec"] }
 tipb = { git = "https://github.com/pingcap/tipb.git" }
-kvproto = { git = "https://github.com/pingcap/kvproto.git" }
+kvproto = { git = "https://github.com/pingcap/kvproto.git", branch= "release-7.5" }
 yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
 tokio-timer = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
 tokio-executor = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }

components/backup/src/service.rs

@@ -166,12 +166,7 @@ where
 mod tests {
     use std::{sync::Arc, time::Duration};
 
-<<<<<<< HEAD
-    use engine_rocks::RocksEngine;
     use external_storage_export::make_local_backend;
-=======
-    use external_storage::make_local_backend;
->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946))
     use tikv::storage::txn::tests::{must_commit, must_prewrite_put};
     use tikv_util::worker::{dummy_scheduler, ReceiverWrapper};
     use txn_types::TimeStamp;

components/snap_recovery/src/services.rs

@@ -219,13 +219,8 @@ impl<ER: RaftEngine> RecoveryService<ER> {
     // a new wait apply syncer share with all regions,
     // when all region reached the target index, share reference decreased to 0,
     // trigger closure to send finish info back.
-<<<<<<< HEAD
-    pub fn wait_apply_last(router: RaftRouter<RocksEngine, ER>, sender: SyncSender<u64>) {
-        let wait_apply = SnapshotRecoveryWaitApplySyncer::new(0, sender);
-=======
-    pub fn wait_apply_last(router: RaftRouter<EK, ER>, sender: Sender<SyncReport>) {
+    pub fn wait_apply_last(router: RaftRouter<RocksEngine, ER>, sender: Sender<SyncReport>) {
         let wait_apply = SnapshotBrWaitApplySyncer::new(0, sender);
->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946))
         router.broadcast_normal(|| {
             PeerMsg::SignificantMsg(SignificantMsg::SnapshotBrWaitApply(
                 SnapshotBrWaitApplyRequest::relaxed(wait_apply.clone()),

components/test_backup/Cargo.toml

@@ -16,6 +16,7 @@ backup = { workspace = true }
 collections = { workspace = true }
 concurrency_manager = { workspace = true }
 crc64fast = "0.1"
+engine_rocks = { workspace = true }
 engine_traits = { workspace = true }
 external_storage_export = { workspace = true }
 file_system = { workspace = true }

components/test_backup/src/disk_snap.rs

@@ -7,7 +7,6 @@ use std::{
 };
 
 use backup::disk_snap::Env as BEnv;
-use engine_rocks::RocksEngine as KTE;
 use futures_executor::block_on;
 use futures_util::{
     sink::SinkExt,
@@ -40,7 +39,7 @@ pub struct Node {
 }
 
 pub struct Suite {
-    pub cluster: Cluster<KTE, ServerCluster<KTE>>,
+    pub cluster: Cluster<ServerCluster>,
     pub nodes: HashMap<u64, Node>,
     grpc_env: Arc<Environment>,
 }

components/test_backup/src/lib.rs

@@ -11,12 +11,6 @@ use std::{
 use api_version::{dispatch_api_version, keyspace::KvPair, ApiV1, KvFormat, RawValue};
 use backup::Task;
 use collections::HashMap;
-<<<<<<< HEAD
-=======
-// NOTE: Perhaps we'd better use test engine here. But it seems for now we cannot initialize a
-// mock cluster with `PanicEngine` and in our CI environment clippy will complain that.
-use engine_rocks::RocksEngine as KTE;
->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946))
 use engine_traits::{CfName, IterOptions, CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN};
 use external_storage_export::make_local_backend;
 use futures::{channel::mpsc as future_mpsc, executor::block_on};
@@ -47,11 +41,7 @@ use txn_types::TimeStamp;
 pub mod disk_snap;
 
 pub struct TestSuite {
-<<<<<<< HEAD
     pub cluster: Cluster<ServerCluster>,
-=======
-    pub cluster: Cluster<KTE, ServerCluster<KTE>>,
->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946))
     pub endpoints: HashMap<u64, LazyWorker<Task>>,
     pub tikv_cli: TikvClient,
     pub context: Context,