From 528990bbcf2baf7e4b5ba03d8bd9a0a822ee667d Mon Sep 17 00:00:00 2001 From: Yu Juncen Date: Tue, 20 Feb 2024 16:18:22 +0800 Subject: [PATCH] resolve conflicts Signed-off-by: Yu Juncen --- Cargo.lock | 3 ++- Cargo.toml | 2 +- components/backup/src/service.rs | 5 ----- components/snap_recovery/src/services.rs | 7 +------ components/test_backup/Cargo.toml | 1 + components/test_backup/src/disk_snap.rs | 3 +-- components/test_backup/src/lib.rs | 10 ---------- 7 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ce368fc7fa..e96a72afebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2933,7 +2933,7 @@ dependencies = [ [[package]] name = "kvproto" version = "0.0.2" -source = "git+https://github.com/pingcap/kvproto.git#a554af8ee11ffdf0adbbf0efac11220e416ddacf" +source = "git+https://github.com/pingcap/kvproto.git?branch=release-7.5#c4a09794a10c8564d8b4645f45b4092b8ff0b29c" dependencies = [ "futures 0.3.15", "grpcio", @@ -6003,6 +6003,7 @@ dependencies = [ "collections", "concurrency_manager", "crc64fast", + "engine_rocks", "engine_traits", "external_storage_export", "file_system", diff --git a/Cargo.toml b/Cargo.toml index d3223d9467b..1e653eddfa9 100644 --- a/Cargo.toml +++ b/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" } diff --git a/components/backup/src/service.rs b/components/backup/src/service.rs index acf7494256f..fd1f61f6e99 100644 --- a/components/backup/src/service.rs +++ b/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; diff --git a/components/snap_recovery/src/services.rs b/components/snap_recovery/src/services.rs index 10b72cd8741..d72f10e4f43 100644 --- a/components/snap_recovery/src/services.rs +++ b/components/snap_recovery/src/services.rs @@ -219,13 +219,8 @@ impl RecoveryService { // 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, sender: SyncSender) { - let wait_apply = SnapshotRecoveryWaitApplySyncer::new(0, sender); -======= - pub fn wait_apply_last(router: RaftRouter, sender: Sender) { + pub fn wait_apply_last(router: RaftRouter, sender: Sender) { 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()), diff --git a/components/test_backup/Cargo.toml b/components/test_backup/Cargo.toml index 8942561a1ba..9d773b5244b 100644 --- a/components/test_backup/Cargo.toml +++ b/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 } diff --git a/components/test_backup/src/disk_snap.rs b/components/test_backup/src/disk_snap.rs index aa1c94f8e5e..dc7857f311f 100644 --- a/components/test_backup/src/disk_snap.rs +++ b/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>, + pub cluster: Cluster, pub nodes: HashMap, grpc_env: Arc, } diff --git a/components/test_backup/src/lib.rs b/components/test_backup/src/lib.rs index 9be063724de..b952d71f5a6 100644 --- a/components/test_backup/src/lib.rs +++ b/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, -======= - pub cluster: Cluster>, ->>>>>>> 956c9f377d (snapshot_backup: enhanced prepare stage (#15946)) pub endpoints: HashMap>, pub tikv_cli: TikvClient, pub context: Context,