chore: aft rebase fix

Signed-off-by: discord9 <[email protected]>

Author: discord9

src/datanode/src/heartbeat/handler/gc_worker.rs

@@ -18,9 +18,7 @@ use mito2::gc::LocalGcWorker;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::{FileRefsManifest, RegionId};
 
-use crate::error::{
-    GcMitoEngineSnafu, InvalidGcArgsSnafu, RegionNotFoundSnafu, Result, UnexpectedSnafu,
-};
+use crate::error::{GcMitoEngineSnafu, InvalidGcArgsSnafu, Result, UnexpectedSnafu};
 use crate::heartbeat::handler::HandlerContext;
 
 impl HandlerContext {

src/meta-srv/src/gc_scheduler.rs

@@ -17,7 +17,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use api::v1::meta::MailboxMessage;
-use common_meta::datanode::{GcStat, RegionManifestInfo, RegionStat};
+use common_meta::datanode::{RegionManifestInfo, RegionStat};
 use common_meta::instruction::{
     GcRegions, GetFileRefs, GetFileRefsReply, Instruction, InstructionReply,
 };

src/mito2/src/engine.rs

@@ -82,7 +82,7 @@ use common_base::Plugins;
 use common_error::ext::BoxedError;
 use common_meta::key::SchemaMetadataManagerRef;
 use common_recordbatch::SendableRecordBatchStream;
-use common_telemetry::{info, tracing, warn, debug};
+use common_telemetry::{info, tracing, warn};
 use common_wal::options::{WAL_OPTIONS_KEY, WalOptions};
 use futures::future::{join_all, try_join_all};
 use futures::stream::{self, Stream, StreamExt};
@@ -102,7 +102,7 @@ use store_api::region_engine::{
 };
 use store_api::region_request::{AffectedRows, RegionOpenRequest, RegionRequest};
 use store_api::sst_entry::{ManifestSstEntry, PuffinIndexMetaEntry, StorageSstEntry};
-use store_api::storage::{FileRefsManifest, FileId, RegionId, ScanRequest, SequenceNumber, TableId};
+use store_api::storage::{FileId, FileRefsManifest, RegionId, ScanRequest, SequenceNumber};
 use tokio::sync::{Semaphore, oneshot};
 
 use crate::access_layer::RegionFilePathFactory;

src/mito2/src/region/opener.rs

@@ -62,7 +62,7 @@ use crate::region_write_ctx::RegionWriteCtx;
 use crate::request::OptionOutputTx;
 use crate::schedule::scheduler::SchedulerRef;
 use crate::sst::FormatType;
-use crate::sst::file_purger::{create_file_purger, create_local_file_purger};
+use crate::sst::file_purger::create_file_purger;
 use crate::sst::file_ref::FileReferenceManagerRef;
 use crate::sst::index::intermediate::IntermediateManager;
 use crate::sst::index::puffin_manager::PuffinManagerFactory;

src/mito2/src/test_util.rs

@@ -609,7 +609,7 @@ impl TestEnv {
                 0,
                 manifest_opts,
                 FormatType::PrimaryKey,
-                Default::default(),
+                &Default::default(),
             )
             .await
             .map(Some)

src/store-api/src/storage/file.rs

@@ -117,8 +117,7 @@ impl GcReport {
                 .or_default()
                 .extend(files.into_iter());
         }
-        self.need_retry_regions
-            .extend(other.need_retry_regions.into_iter());
+        self.need_retry_regions.extend(other.need_retry_regions);
     }
 }