Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
Signed-off-by: Little-Wallace <[email protected]>
  • Loading branch information
Little-Wallace committed Mar 4, 2024
1 parent 9a9530c commit 72406da
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/compute/src/memory/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down Expand Up @@ -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,
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ctl/src/common/hummock_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})))
}
}
2 changes: 2 additions & 0 deletions src/storage/hummock_test/src/bin/replay/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) = {
Expand Down
1 change: 0 additions & 1 deletion src/storage/src/hummock/block_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions src/tests/compaction_test/src/delete_range_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 72406da

Please sign in to comment.