From 335f0a6db36ed55472af9bcd0ffc0c9866806b38 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <nitish@parseable.com>
Date: Mon, 19 Feb 2024 12:34:52 +0530
Subject: [PATCH] Revert "fix: avoid removal of retention configuration while
 updating snapshot" (#666)

Reverts #661 because with this change we're backward incompatible with older
versions where .stream.json doesn't contain retention field.

This reverts commit 121bf01a03e1b442761e99275b1c70d9bff31733.
---
 server/src/storage.rs           | 3 ---
 server/src/storage/retention.rs | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/server/src/storage.rs b/server/src/storage.rs
index 52b1b61a3..975fcf445 100644
--- a/server/src/storage.rs
+++ b/server/src/storage.rs
@@ -37,7 +37,6 @@ pub use store_metadata::{
     put_remote_metadata, put_staging_metadata, resolve_parseable_metadata, StorageMetadata,
 };
 
-use self::retention::Retention;
 pub use self::staging::StorageDir;
 
 /// local sync interval to move data.records to /tmp dir of that stream.
@@ -77,7 +76,6 @@ pub struct ObjectStoreFormat {
     pub snapshot: Snapshot,
     #[serde(default)]
     pub cache_enabled: bool,
-    pub retention: Retention,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
@@ -120,7 +118,6 @@ impl Default for ObjectStoreFormat {
             stats: Stats::default(),
             snapshot: Snapshot::default(),
             cache_enabled: false,
-            retention: Retention::new(),
         }
     }
 }
diff --git a/server/src/storage/retention.rs b/server/src/storage/retention.rs
index 161505e5e..beb8edd2e 100644
--- a/server/src/storage/retention.rs
+++ b/server/src/storage/retention.rs
@@ -134,12 +134,6 @@ struct TaskView {
     duration: String,
 }
 
-impl Retention {
-    pub fn new() -> Self {
-        Self { tasks: Vec::new() }
-    }
-}
-
 impl TryFrom<Vec<TaskView>> for Retention {
     type Error = String;