chore: temporarily bypass FullKeyTracker for #15099 (#15100)

risingwavelabs · Feb 17, 2024 · dfb7989 · dfb7989
1 parent e2c1410
commit dfb7989
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/storage/hummock_sdk/src/key.rs b/src/storage/hummock_sdk/src/key.rs
@@ -935,14 +935,21 @@ pub fn bound_table_key_range<T: AsRef<[u8]> + EmptySliceRef>(
 pub struct FullKeyTracker<T: AsRef<[u8]> + Ord + Eq> {
     pub latest_full_key: FullKey<T>,
     last_observed_epoch_with_gap: EpochWithGap,
+    /// TODO: Temporary bypass full key check. Remove this field after #15099 is resolved.
+    allow_same_full_key: bool,
 }
 
 impl<T: AsRef<[u8]> + Ord + Eq> FullKeyTracker<T> {
     pub fn new(init_full_key: FullKey<T>) -> Self {
+        Self::with_config(init_full_key, false)
+    }
+
+    pub fn with_config(init_full_key: FullKey<T>, allow_same_full_key: bool) -> Self {
         let epoch_with_gap = init_full_key.epoch_with_gap;
         Self {
             latest_full_key: init_full_key,
             last_observed_epoch_with_gap: epoch_with_gap,
+            allow_same_full_key,
         }
     }
 
@@ -1032,7 +1039,10 @@ impl<T: AsRef<[u8]> + Ord + Eq> FullKeyTracker<T> {
                 ))
             }
             Ordering::Equal => {
-                if max_epoch_with_gap >= self.last_observed_epoch_with_gap {
+                if max_epoch_with_gap > self.last_observed_epoch_with_gap
+                    || (!self.allow_same_full_key
+                        && max_epoch_with_gap == self.last_observed_epoch_with_gap)
+                {
                     // Epoch from the same user key should be monotonically decreasing
                     panic!(
                         "key {:?} epoch {:?} >= prev epoch {:?}",

diff --git a/src/storage/src/hummock/iterator/forward_user.rs b/src/storage/src/hummock/iterator/forward_user.rs
@@ -78,7 +78,7 @@ impl<I: HummockIterator<Direction = Forward>> UserIterator<I> {
             delete_range_iter,
             _version: version,
             is_current_pos_valid: false,
-            full_key_tracker: FullKeyTracker::new(FullKey::default()),
+            full_key_tracker: FullKeyTracker::with_config(FullKey::default(), true),
         }
     }
 
@@ -136,7 +136,7 @@ impl<I: HummockIterator<Direction = Forward>> UserIterator<I> {
     pub async fn rewind(&mut self) -> HummockResult<()> {
         // Reset
         self.is_current_pos_valid = false;
-        self.full_key_tracker = FullKeyTracker::new(FullKey::default());
+        self.full_key_tracker = FullKeyTracker::with_config(FullKey::default(), true);
 
         // Handle range scan
         match &self.key_range.0 {
@@ -180,7 +180,7 @@ impl<I: HummockIterator<Direction = Forward>> UserIterator<I> {
     pub async fn seek(&mut self, user_key: UserKey<&[u8]>) -> HummockResult<()> {
         // Reset
         self.is_current_pos_valid = false;
-        self.full_key_tracker = FullKeyTracker::new(FullKey::default());
+        self.full_key_tracker = FullKeyTracker::with_config(FullKey::default(), true);
 
         // Handle range scan when key < begin_key
         let user_key = match &self.key_range.0 {