Skip to content

Commit

Permalink
refactor(storage): reorg writer code (#18291)
Browse files Browse the repository at this point in the history
  • Loading branch information
Li0k authored Aug 28, 2024
1 parent 04b9cb4 commit 9f52981
Show file tree
Hide file tree
Showing 5 changed files with 470 additions and 448 deletions.
3 changes: 2 additions & 1 deletion src/compute/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ use risingwave_storage::hummock::compactor::{
new_compaction_await_tree_reg_ref, start_compactor, CompactionExecutor, CompactorContext,
};
use risingwave_storage::hummock::hummock_meta_client::MonitoredHummockMetaClient;
use risingwave_storage::hummock::{HummockMemoryCollector, MemoryLimiter};
use risingwave_storage::hummock::utils::HummockMemoryCollector;
use risingwave_storage::hummock::MemoryLimiter;
use risingwave_storage::monitor::{
global_hummock_state_store_metrics, global_storage_metrics, monitor_cache,
GLOBAL_COMPACTOR_METRICS, GLOBAL_HUMMOCK_METRICS, GLOBAL_OBJECT_STORE_METRICS,
Expand Down
7 changes: 3 additions & 4 deletions src/storage/compactor/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ use risingwave_storage::hummock::compactor::{
CompactorContext,
};
use risingwave_storage::hummock::hummock_meta_client::MonitoredHummockMetaClient;
use risingwave_storage::hummock::{
HummockMemoryCollector, MemoryLimiter, SstableObjectIdManager, SstableStore,
};
use risingwave_storage::hummock::utils::HummockMemoryCollector;
use risingwave_storage::hummock::{MemoryLimiter, SstableObjectIdManager, SstableStore};
use risingwave_storage::monitor::{
monitor_cache, CompactorMetrics, GLOBAL_COMPACTOR_METRICS, GLOBAL_HUMMOCK_METRICS,
};
Expand Down Expand Up @@ -139,7 +138,7 @@ pub async fn prepare_start_parameters(

let memory_limiter = Arc::new(MemoryLimiter::new(compactor_memory_limit_bytes));
let storage_memory_config = extract_storage_memory_config(&config);
let memory_collector: Arc<HummockMemoryCollector> = Arc::new(HummockMemoryCollector::new(
let memory_collector = Arc::new(HummockMemoryCollector::new(
sstable_store.clone(),
memory_limiter.clone(),
storage_memory_config,
Expand Down
Loading

0 comments on commit 9f52981

Please sign in to comment.