Skip to content

Commit 335f0a6

Browse files
authored
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 121bf01.
1 parent b9ac6cf commit 335f0a6

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

server/src/storage.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ pub use store_metadata::{
3737
put_remote_metadata, put_staging_metadata, resolve_parseable_metadata, StorageMetadata,
3838
};
3939

40-
use self::retention::Retention;
4140
pub use self::staging::StorageDir;
4241

4342
/// local sync interval to move data.records to /tmp dir of that stream.
@@ -77,7 +76,6 @@ pub struct ObjectStoreFormat {
7776
pub snapshot: Snapshot,
7877
#[serde(default)]
7978
pub cache_enabled: bool,
80-
pub retention: Retention,
8179
}
8280

8381
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
@@ -120,7 +118,6 @@ impl Default for ObjectStoreFormat {
120118
stats: Stats::default(),
121119
snapshot: Snapshot::default(),
122120
cache_enabled: false,
123-
retention: Retention::new(),
124121
}
125122
}
126123
}

server/src/storage/retention.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,6 @@ struct TaskView {
134134
duration: String,
135135
}
136136

137-
impl Retention {
138-
pub fn new() -> Self {
139-
Self { tasks: Vec::new() }
140-
}
141-
}
142-
143137
impl TryFrom<Vec<TaskView>> for Retention {
144138
type Error = String;
145139

0 commit comments

Comments
 (0)