Skip to content

remove first-event-at from stream.json but keep it in stats api #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2024
Merged

remove first-event-at from stream.json but keep it in stats api #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions server/src/handlers/http/logstream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,6 @@ pub async fn get_stats(req: HttpRequest) -> Result<impl Responder, StreamError>
if first_event_at_empty(&stream_name) {
let store = CONFIG.storage().get_object_store();
if let Ok(Some(first_event_at)) = catalog::get_first_event(store, &stream_name).await {
if let Err(err) = CONFIG
.storage()
.get_object_store()
.put_first_event_at(&stream_name, &first_event_at)
.await
{
log::error!(
"Failed to update first_event_at in metadata for stream {:?} {err:?}",
stream_name
);
}

if let Err(err) =
metadata::STREAM_INFO.set_first_event_at(&stream_name, Some(first_event_at))
{
Expand Down
1 change: 1 addition & 0 deletions server/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub struct ObjectStoreFormat {
#[serde(rename = "created-at")]
pub created_at: String,
#[serde(rename = "first-event-at")]
#[serde(skip_serializing_if = "Option::is_none")]
pub first_event_at: Option<String>,
Copy link
Member

@nitisht nitisht Feb 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

even the first_event_at is not needed right?

pub owner: Owner,
pub permissions: Vec<Permisssion>,
Expand Down
17 changes: 0 additions & 17 deletions server/src/storage/object_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,6 @@ pub trait ObjectStorage: Sync + 'static {
self.put_object(&path, to_bytes(&stream_metadata)).await
}

async fn put_first_event_at(
&self,
stream_name: &str,
first_event_at: &str,
) -> Result<(), ObjectStorageError> {
let path = stream_json_path(stream_name);
let stream_metadata = self.get_object(&path).await?;
let first_event_ts =
serde_json::to_value(first_event_at).expect("first_event_at is perfectly serializable");
let mut stream_metadata: serde_json::Value =
serde_json::from_slice(&stream_metadata).expect("parseable config is valid json");

stream_metadata["first-event-at"] = first_event_ts;

self.put_object(&path, to_bytes(&stream_metadata)).await
}

async fn put_metadata(
&self,
parseable_metadata: &StorageMetadata,
Expand Down
12 changes: 0 additions & 12 deletions server/src/storage/retention.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,6 @@ mod action {
}

if let Ok(Some(first_event_at)) = catalog::get_first_event(store, &stream_name).await {
if let Err(err) = CONFIG
.storage()
.get_object_store()
.put_first_event_at(&stream_name, &first_event_at)
.await
{
log::error!(
"Failed to update first_event_at in metadata for stream {:?} {err:?}",
stream_name
);
}

if let Err(err) =
metadata::STREAM_INFO.set_first_event_at(&stream_name, Some(first_event_at))
{
Expand Down