From 72406da55ee7b88493165e23ad494b8e167d9153 Mon Sep 17 00:00:00 2001
From: Little-Wallace <bupt2013211450@gmail.com>
Date: Mon, 4 Mar 2024 21:07:48 +0800
Subject: [PATCH] fix ci

Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>
---
 src/compute/src/memory/config.rs                     | 6 ++++--
 src/ctl/src/common/hummock_service.rs                | 2 ++
 src/storage/hummock_test/src/bin/replay/main.rs      | 2 ++
 src/storage/src/hummock/block_cache.rs               | 1 -
 src/tests/compaction_test/src/delete_range_runner.rs | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/compute/src/memory/config.rs b/src/compute/src/memory/config.rs
index 7c7b048e90d5a..f37869e53d57d 100644
--- a/src/compute/src/memory/config.rs
+++ b/src/compute/src/memory/config.rs
@@ -91,7 +91,7 @@ pub fn storage_memory_config(
 
     let prefetch_buffer_capacity_mb = storage_config
         .prefetch_buffer_capacity_mb
-        .unwrap_or(block_cache_capacity_mb);
+        .unwrap_or(default_block_cache_capacity_mb);
 
     if meta_cache_capacity_mb != default_meta_cache_capacity_mb {
         default_block_cache_capacity_mb += default_meta_cache_capacity_mb;
@@ -114,7 +114,7 @@ pub fn storage_memory_config(
         default_block_cache_capacity_mb += default_shared_buffer_capacity_mb;
         default_block_cache_capacity_mb -= shared_buffer_capacity_mb;
     }
-    let mut block_cache_capacity_mb = storage_config
+    let block_cache_capacity_mb = storage_config
         .block_cache_capacity_mb
         .unwrap_or(default_block_cache_capacity_mb);
 
@@ -177,6 +177,8 @@ pub fn storage_memory_config(
         compactor_memory_limit_mb,
         prefetch_buffer_capacity_mb,
         high_priority_ratio_in_percent,
+        block_shard_num,
+        meta_shard_num,
     }
 }
 
diff --git a/src/ctl/src/common/hummock_service.rs b/src/ctl/src/common/hummock_service.rs
index b88dd265d382b..f30c36eb4a2f0 100644
--- a/src/ctl/src/common/hummock_service.rs
+++ b/src/ctl/src/common/hummock_service.rs
@@ -176,6 +176,8 @@ impl HummockServiceOpts {
             state_store_metrics: Arc::new(global_hummock_state_store_metrics(
                 MetricLevel::Disabled,
             )),
+            block_shard_num: opts.block_shard_num,
+            meta_shard_num: opts.meta_shard_num,
         })))
     }
 }
diff --git a/src/storage/hummock_test/src/bin/replay/main.rs b/src/storage/hummock_test/src/bin/replay/main.rs
index 276a72bb26592..99608e1b655e9 100644
--- a/src/storage/hummock_test/src/bin/replay/main.rs
+++ b/src/storage/hummock_test/src/bin/replay/main.rs
@@ -122,6 +122,8 @@ async fn create_replay_hummock(r: Record, args: &Args) -> Result<impl GlobalRepl
         meta_file_cache: FileCache::none(),
         recent_filter: None,
         state_store_metrics: state_store_metrics.clone(),
+        meta_shard_num: storage_opts.meta_shard_num,
+        block_shard_num: storage_opts.block_shard_num,
     }));
 
     let (hummock_meta_client, notification_client, notifier) = {
diff --git a/src/storage/src/hummock/block_cache.rs b/src/storage/src/hummock/block_cache.rs
index 476547fd4f34c..175505f75c9e4 100644
--- a/src/storage/src/hummock/block_cache.rs
+++ b/src/storage/src/hummock/block_cache.rs
@@ -29,7 +29,6 @@ use tokio::task::JoinHandle;
 use super::{Block, HummockResult};
 use crate::hummock::HummockError;
 
-
 type CachedBlockEntry = CacheableEntry<(HummockSstableObjectId, u64), Box<Block>>;
 
 enum BlockEntry {
diff --git a/src/tests/compaction_test/src/delete_range_runner.rs b/src/tests/compaction_test/src/delete_range_runner.rs
index 2f501ff98591e..25fa918b938f2 100644
--- a/src/tests/compaction_test/src/delete_range_runner.rs
+++ b/src/tests/compaction_test/src/delete_range_runner.rs
@@ -220,6 +220,8 @@ async fn compaction_test(
         meta_file_cache: FileCache::none(),
         recent_filter: None,
         state_store_metrics: state_store_metrics.clone(),
+        meta_shard_num: storage_memory_config.meta_shard_num,
+        block_shard_num: storage_memory_config.block_shard_num,
     }));
 
     let store = HummockStorage::new(