adapt

Signed-off-by: Calvin Neo <calvinneo1995@gmail.com>
pingcap · Jan 20, 2025 · 65d0b50 · 65d0b50
1 parent 8166ec3
commit 65d0b50
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/proxy_components/engine_tiflash/src/import.rs b/proxy_components/engine_tiflash/src/import.rs
@@ -1,5 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
-
+#[allow(unreachable_code)]
+#[allow(unused_variables)]
 use engine_traits::{ImportExt, IngestExternalFileOptions, Result};
 use rocksdb::IngestExternalFileOptions as RawIngestExternalFileOptions;
 use tikv_util::time::Instant;
@@ -14,7 +15,7 @@ impl ImportExt for RocksEngine {
     fn ingest_external_file_cf(&self, cf_name: &str, files: &[&str]) -> Result<()> {
         // do nothing
         return Ok(());
-        
+
         let cf = util::get_cf_handle(self.as_inner(), cf_name)?;
         let mut opts = RocksIngestExternalFileOptions::new();
         opts.move_files(true);

diff --git a/proxy_components/mock-engine-store/src/mock_cluster/v1/node.rs b/proxy_components/mock-engine-store/src/mock_cluster/v1/node.rs
@@ -27,12 +27,11 @@ use raftstore::{
         config::RaftstoreConfigManager,
         copy_snapshot,
         fsm::{store::StoreMeta, RaftBatchSystem, RaftRouter},
-        AutoSplitController, Callback, LocalReader, RaftCmdExtraOpts, SnapEntry, SnapKey,
-        SnapManager, SnapManagerBuilder, SplitCheckRunner, StoreMetaDelegate, Transport,
+        AutoSplitController, Callback, DiskCheckRunner, LocalReader, RaftCmdExtraOpts, SnapEntry,
+        SnapKey, SnapManager, SnapManagerBuilder, SplitCheckRunner, StoreMetaDelegate, Transport,
     },
     Result,
 };
-use raftstore::store::DiskCheckRunner;
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
 use tempfile::TempDir;

diff --git a/proxy_components/mock-engine-store/src/mock_cluster/v1/server.rs b/proxy_components/mock-engine-store/src/mock_cluster/v1/server.rs
@@ -38,12 +38,12 @@ use raftstore::{
     store::{
         fsm::{store::StoreMeta, ApplyRouter, RaftBatchSystem, RaftRouter},
         msg::RaftCmdExtraOpts,
-        AutoSplitController, Callback, CheckLeaderRunner, LocalReader, RegionSnapshot, SnapManager,
-        SnapManagerBuilder, SplitCheckRunner, SplitConfigManager, StoreMetaDelegate,
+        AutoSplitController, Callback, CheckLeaderRunner, DiskCheckRunner, LocalReader,
+        RegionSnapshot, SnapManager, SnapManagerBuilder, SplitCheckRunner, SplitConfigManager,
+        StoreMetaDelegate,
     },
     Result,
 };
-use raftstore::store::DiskCheckRunner;
 use resource_metering::{CollectorRegHandle, ResourceTagFactory};
 use security::SecurityManager;
 use service::service_manager::GrpcServiceManager;

diff --git a/proxy_components/proxy_ffi/src/jemalloc_utils.rs b/proxy_components/proxy_ffi/src/jemalloc_utils.rs
@@ -30,6 +30,7 @@ extern "C" {
 #[allow(unused_variables)]
 #[allow(unused_mut)]
 #[allow(unused_unsafe)]
+#[allow(unreachable_code)]
 pub fn issue_mallctl_args(
     command: &str,
     oldptr: *mut ::std::os::raw::c_void,

diff --git a/proxy_components/proxy_server/src/run.rs b/proxy_components/proxy_server/src/run.rs
@@ -33,7 +33,6 @@ use engine_store_ffi::{
     },
     TiFlashEngine,
 };
-use raftstore::store::DiskCheckRunner;
 use engine_tiflash::PSLogEngine;
 use engine_traits::{
     Engines, KvEngine, MiscExt, RaftEngine, SingletonFactory, TabletContext, TabletRegistry,
@@ -60,8 +59,8 @@ use raftstore::{
             RaftBatchSystem, RaftRouter, StoreMeta, MULTI_FILES_SNAPSHOT_FEATURE, PENDING_MSG_CAP,
         },
         memory::MEMTRACE_ROOT as MEMTRACE_RAFTSTORE,
-        AutoSplitController, CheckLeaderRunner, LocalReader, SnapManager, SnapManagerBuilder,
-        SplitCheckRunner, SplitConfigManager, StoreMetaDelegate,
+        AutoSplitController, CheckLeaderRunner, DiskCheckRunner, LocalReader, SnapManager,
+        SnapManagerBuilder, SplitCheckRunner, SplitConfigManager, StoreMetaDelegate,
     },
 };
 use resource_control::{