after refactor

Signed-off-by: discord9 <discord9@163.com>

Author: discord9

src/datanode/src/heartbeat/handler.rs

@@ -115,9 +115,9 @@ impl RegionHeartbeatResponseHandler {
             Instruction::FlushRegions(_) => Ok(Box::new(FlushRegionsHandler.into())),
             Instruction::DowngradeRegions(_) => Ok(Box::new(DowngradeRegionsHandler.into())),
             Instruction::UpgradeRegion(_) => Ok(Box::new(UpgradeRegionsHandler.into())),
+            Instruction::GetFileRefs(_) => Ok(Box::new(GetFileRefsHandler.into())),
+            Instruction::GcRegions(_) => Ok(Box::new(GcRegionsHandler.into())),
             Instruction::InvalidateCaches(_) => InvalidHeartbeatResponseSnafu.fail(),
-            Instruction::GetFileRefs(_) => Ok(Box::new(GetFileRefsHandler)),
-            Instruction::GcRegions(_) => Ok(Box::new(GcRegionsHandler)),
         }
     }
 }
@@ -129,6 +129,8 @@ pub enum InstructionHandlers {
     FlushRegions(FlushRegionsHandler),
     DowngradeRegions(DowngradeRegionsHandler),
     UpgradeRegions(UpgradeRegionsHandler),
+    GetFileRefs(GetFileRefsHandler),
+    GcRegions(GcRegionsHandler),
 }
 
 macro_rules! impl_from_handler {
@@ -148,7 +150,9 @@ impl_from_handler!(
     OpenRegionsHandler => OpenRegions,
     FlushRegionsHandler => FlushRegions,
     DowngradeRegionsHandler => DowngradeRegions,
-    UpgradeRegionsHandler => UpgradeRegions
+    UpgradeRegionsHandler => UpgradeRegions,
+    GetFileRefsHandler => GetFileRefs,
+    GcRegionsHandler => GcRegions
 );
 
 macro_rules! dispatch_instr {
@@ -191,6 +195,8 @@ dispatch_instr!(
     FlushRegions => FlushRegions,
     DowngradeRegions => DowngradeRegions,
     UpgradeRegion => UpgradeRegions,
+    GetFileRefs => GetFileRefs,
+    GcRegions => GcRegions,
 );
 
 #[async_trait]

src/datanode/src/heartbeat/handler/file_ref.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use common_error::ext::ErrorExt;
-use common_meta::instruction::{GetFileRefsReply, Instruction, InstructionReply};
+use common_meta::instruction::{GetFileRefs, GetFileRefsReply, InstructionReply};
 use store_api::storage::FileRefsManifest;
 
 use crate::heartbeat::handler::{HandlerContext, InstructionHandler};
@@ -22,12 +22,13 @@ pub struct GetFileRefsHandler;
 
 #[async_trait::async_trait]
 impl InstructionHandler for GetFileRefsHandler {
+    type Instruction = GetFileRefs;
+
     async fn handle(
         &self,
         ctx: &HandlerContext,
-        instruction: Instruction,
+        get_file_refs: Self::Instruction,
     ) -> Option<InstructionReply> {
-        let get_file_refs = instruction.into_get_file_refs().unwrap();
         let region_server = &ctx.region_server;
 
         // Get the MitoEngine

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use common_meta::instruction::{GcRegionsReply, Instruction, InstructionReply};
+use common_meta::instruction::{GcRegions, GcRegionsReply, InstructionReply};
 use common_telemetry::{debug, warn};
 use mito2::gc::LocalGcWorker;
 use snafu::{OptionExt, ResultExt};
@@ -25,12 +25,13 @@ pub struct GcRegionsHandler;
 
 #[async_trait::async_trait]
 impl InstructionHandler for GcRegionsHandler {
+    type Instruction = GcRegions;
+
     async fn handle(
         &self,
         ctx: &HandlerContext,
-        instruction: Instruction,
+        gc_regions: Self::Instruction,
     ) -> Option<InstructionReply> {
-        let gc_regions = instruction.into_gc_regions().unwrap();
         let region_ids = gc_regions.regions.clone();
         debug!("Received gc regions instruction: {:?}", region_ids);