chore: resolve conflicts

GreptimeTeam · Jan 4, 2024 · cc64d10 · cc64d10
1 parent 33c47e4
commit cc64d10
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/mito2/src/error.rs b/src/mito2/src/error.rs
@@ -424,6 +424,18 @@ pub enum Error {
         error: parquet::errors::ParquetError,
     },
 
+    #[snafu(display(
+        "Stale log entry found during replay, region: {}, flushed: {}, replayed: {}",
+        region_id,
+        flushed_entry_id,
+        unexpected_entry_id
+    ))]
+    StaleLogEntry {
+        region_id: RegionId,
+        flushed_entry_id: u64,
+        unexpected_entry_id: u64,
+    },
+
     #[snafu(display("Column not found, column: {column}"))]
     ColumnNotFound { column: String, location: Location },