refactor: impl StateStore for HummockStorage and remove HummockStateS…

…tore (#1383)
risingwavelabs · Mar 29, 2022 · 965c914 · 965c914
1 parent 482e064
commit 965c914
Show file tree

Hide file tree

Showing 7 changed files with 424 additions and 516 deletions.
diff --git a/rust/compute/src/server.rs b/rust/compute/src/server.rs
@@ -114,10 +114,10 @@ pub async fn compute_node_serve(
     // A hummock compactor is deployed along with compute node for now.
     if let StateStoreImpl::HummockStateStore(hummock) = state_store.clone() {
         sub_tasks.push(Compactor::start_compactor(
-            hummock.inner().storage.options().clone(),
-            hummock.inner().storage.local_version_manager().clone(),
-            hummock.inner().storage.hummock_meta_client().clone(),
-            hummock.inner().storage.sstable_store(),
+            hummock.inner().options().clone(),
+            hummock.inner().local_version_manager().clone(),
+            hummock.inner().hummock_meta_client().clone(),
+            hummock.inner().sstable_store(),
             state_store_metrics,
         ));
     }

diff --git a/rust/ctl/src/common/hummock_service.rs b/rust/ctl/src/common/hummock_service.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 
 use anyhow::{anyhow, Result};
 use risingwave_common::config::StorageConfig;
-use risingwave_storage::hummock::HummockStateStore;
+use risingwave_storage::hummock::HummockStorage;
 use risingwave_storage::monitor::{HummockMetrics, MonitoredStateStore, StateStoreMetrics};
 use risingwave_storage::StateStoreImpl;
 
@@ -50,7 +50,7 @@ impl HummockServiceOpts {
         })
     }
 
-    pub async fn create_hummock_store(&self) -> Result<MonitoredStateStore<HummockStateStore>> {
+    pub async fn create_hummock_store(&self) -> Result<MonitoredStateStore<HummockStorage>> {
         let meta_client = self.meta_opts.create_meta_client().await?;
 
         // FIXME: allow specify custom config