Skip to content

Fix schema map deserialize #285

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 14, 2023
Merged

Fix schema map deserialize #285

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
29 changes: 24 additions & 5 deletions server/src/storage/object_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ use itertools::kmerge_by;
use lazy_static::__Deref;
use relative_path::RelativePath;
use relative_path::RelativePathBuf;
use serde::Serialize;
use serde_json::Value;

use std::{
Expand Down Expand Up @@ -149,9 +148,29 @@ pub trait ObjectStorage: Sync + 'static {
&self,
stream_name: &str,
) -> Result<HashMap<String, Arc<Schema>>, ObjectStorageError> {
let schema = self.get_object(&schema_path(stream_name)).await?;
let schema = serde_json::from_slice(&schema).expect("schema map is valid json");
Ok(schema)
let schema_map = self.get_object(&schema_path(stream_name)).await?;
if let Ok(schema_map) = serde_json::from_slice(&schema_map) {
Ok(schema_map)
} else {
// fix for schema metadata serialize
let mut schema_map: serde_json::Value =
serde_json::from_slice(&schema_map).expect("valid json");

for schema in schema_map
.as_object_mut()
.expect("schema map is json object")
.values_mut()
{
let map = schema.as_object_mut().unwrap();
map.insert(
"metadata".to_string(),
Value::Object(serde_json::Map::new()),
);
}

Ok(serde_json::from_value(schema_map)
.expect("should be deserializable after alteration"))
}
}

async fn get_alerts(&self, stream_name: &str) -> Result<Alerts, ObjectStorageError> {
Expand Down Expand Up @@ -380,7 +399,7 @@ impl MergedRecordReader {
}

#[inline(always)]
fn to_bytes(any: &(impl ?Sized + Serialize)) -> Bytes {
fn to_bytes(any: &(impl ?Sized + serde::Serialize)) -> Bytes {
serde_json::to_vec(any)
.map(|any| any.into())
.expect("serialize cannot fail")
Expand Down