merge main

risingwavelabs · Jul 11, 2024 · 43aa86f · 43aa86f
1 parent dfff823
commit 43aa86f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/meta/src/hummock/manager/commit_epoch.rs b/src/meta/src/hummock/manager/commit_epoch.rs
@@ -31,6 +31,7 @@ use risingwave_pb::hummock::{GroupDelta, HummockSnapshot, IntraLevelDelta, State
 use sea_orm::TransactionTrait;
 
 use crate::hummock::error::{Error, Result};
+use crate::hummock::manager::time_travel::require_sql_meta_store_err;
 use crate::hummock::manager::transaction::{
     HummockVersionStatsTransaction, HummockVersionTransaction,
 };
@@ -43,7 +44,6 @@ use crate::hummock::{
     commit_multi_var, commit_multi_var_with_provided_txn, start_measure_real_process_timer,
     HummockManager,
 };
-use crate::hummock::manager::time_travel::require_sql_meta_store_err;
 
 #[derive(Debug, Clone)]
 pub struct NewTableFragmentInfo {
@@ -433,9 +433,7 @@ impl HummockManager {
                 .values()
                 .map(|g| (g.group_id, g.parent_group_id))
                 .collect();
-            let sql_store = self
-                .sql_store()
-                .ok_or_else(require_sql_meta_store_err)?;
+            let sql_store = self.sql_store().ok_or_else(require_sql_meta_store_err)?;
             let mut txn = sql_store.conn.begin().await?;
             let version_snapshot_sst_ids = self
                 .write_time_travel_metadata(

diff --git a/src/storage/hummock_sdk/src/time_travel.rs b/src/storage/hummock_sdk/src/time_travel.rs
@@ -298,7 +298,7 @@ impl From<(&HummockVersionDelta, &HashSet<CompactionGroupId>)> for IncompleteHum
                 })
                 .collect(),
             max_committed_epoch: delta.max_committed_epoch,
-            safe_epoch: delta.safe_epoch,
+            safe_epoch: delta.visible_table_safe_epoch(),
             trivial_move: delta.trivial_move,
             new_table_watermarks: delta.new_table_watermarks.clone(),
             removed_table_ids: delta.removed_table_ids.clone(),