ensure ReadVersion is created with replication options

risingwavelabs · Jun 9, 2023 · a1e3da4 · a1e3da4
1 parent 23ecee7
commit a1e3da4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/storage/src/hummock/event_handler/hummock_event_handler.rs b/src/storage/src/hummock/event_handler/hummock_event_handler.rs
@@ -558,10 +558,14 @@ impl HummockEventHandler {
                         HummockEvent::RegisterReadVersion {
                             table_id,
                             new_read_version_sender,
+                            is_replicated,
                         } => {
                             let pinned_version = self.pinned_version.load();
                             let basic_read_version = Arc::new(RwLock::new(
-                                HummockReadVersion::new((**pinned_version).clone()),
+                                HummockReadVersion::new_with_replication_option(
+                                    (**pinned_version).clone(),
+                                    is_replicated,
+                                ),
                             ));
 
                             let instance_id = self.generate_instance_id();

diff --git a/src/storage/src/hummock/event_handler/mod.rs b/src/storage/src/hummock/event_handler/mod.rs
@@ -76,6 +76,7 @@ pub enum HummockEvent {
         table_id: TableId,
         new_read_version_sender:
             oneshot::Sender<(Arc<RwLock<HummockReadVersion>>, LocalInstanceGuard)>,
+        is_replicated: bool,
     },
 
     DestroyReadVersion {
@@ -116,7 +117,11 @@ impl HummockEvent {
             HummockEvent::RegisterReadVersion {
                 table_id,
                 new_read_version_sender: _,
-            } => format!("RegisterReadVersion table_id {:?}", table_id,),
+                is_replicated,
+            } => format!(
+                "RegisterReadVersion table_id {:?}, is_replicated: {:?}",
+                table_id, is_replicated
+            ),
 
             HummockEvent::DestroyReadVersion {
                 table_id,

diff --git a/src/storage/src/hummock/mod.rs b/src/storage/src/hummock/mod.rs
@@ -234,6 +234,7 @@ impl HummockStorage {
             .send(HummockEvent::RegisterReadVersion {
                 table_id: option.table_id,
                 new_read_version_sender: tx,
+                is_replicated: option.is_replicated,
             })
             .unwrap();
 

diff --git a/src/storage/src/hummock/store/version.rs b/src/storage/src/hummock/store/version.rs
@@ -215,7 +215,10 @@ pub struct HummockReadVersion {
 }
 
 impl HummockReadVersion {
-    fn new_inner(committed_version: CommittedVersion, is_replicated: bool) -> Self {
+    pub fn new_with_replication_option(
+        committed_version: CommittedVersion,
+        is_replicated: bool,
+    ) -> Self {
         // before build `HummockReadVersion`, we need to get the a initial version which obtained
         // from meta. want this initialization after version is initialized (now with
         // notification), so add a assert condition to guarantee correct initialization order
@@ -234,11 +237,7 @@ impl HummockReadVersion {
     }
 
     pub fn new(committed_version: CommittedVersion) -> Self {
-        Self::new_inner(committed_version, false)
-    }
-
-    pub fn new_replicated(committed_version: CommittedVersion) -> Self {
-        Self::new_inner(committed_version, true)
+        Self::new_with_replication_option(committed_version, false)
     }
 
     /// Updates the read version with `VersionUpdate`.