Skip to content
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

refactor: suggestions #5

Merged
merged 4 commits into from
Jan 17, 2025
Merged

refactor: suggestions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a8c84
refactor: unnest
de-sh Jan 17, 2025
4a3883f
refactor: don't branch
de-sh Jan 17, 2025
99978cf
don't await collection
de-sh Jan 17, 2025
393d374
refactor: string construction
de-sh Jan 17, 2025
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
26 changes: 9 additions & 17 deletions src/correlation/mod.rs → src/correlation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,11 @@ impl Correlation {
.into_iter()
.flat_map(|(_, correlations_bytes)| correlations_bytes)
.filter_map(|correlation| {
if correlation.is_empty() {
None
} else {
match serde_json::from_slice(&correlation) {
Ok(correlation_config) => Some(correlation_config),
Err(e) => {
error!("Unable to load correlation: {e}");
None
}
}
}
serde_json::from_slice(&correlation)
.inspect_err(|e| {
error!("Unable to load correlation: {e}");
})
.ok()
})
.collect();

Expand Down Expand Up @@ -107,13 +101,11 @@ impl Correlation {
.find(|c| c.id == correlation_id && c.user_id == user_id)
.cloned();

if let Some(c) = correlation {
Ok(c)
} else {
Err(CorrelationError::AnyhowError(anyhow::Error::msg(format!(
correlation.ok_or_else(|| {
CorrelationError::AnyhowError(anyhow::Error::msg(format!(
"Unable to find correlation with ID- {correlation_id}"
))))
}
)))
})
}

pub async fn update(&self, correlation: &CorrelationConfig) -> Result<(), CorrelationError> {
Expand Down
18 changes: 6 additions & 12 deletions src/storage/azure_blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,10 +678,8 @@ impl ObjectStorage for BlobStore {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_dashboard_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "dashboards"
));
let user_dashboard_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
let dashboard_bytes = self
.get_objects(
Expand Down Expand Up @@ -716,10 +714,8 @@ impl ObjectStorage for BlobStore {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_filters_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "filters"
));
let user_filters_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/filters",));
let resp = self
.client
.list_with_delimiter(Some(&user_filters_path))
Expand Down Expand Up @@ -767,10 +763,8 @@ impl ObjectStorage for BlobStore {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_correlation_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "correlations"
));
let user_correlation_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/correlations"));
let correlations_path = RelativePathBuf::from(&user_correlation_path);
let correlation_bytes = self
.get_objects(
Expand Down
15 changes: 7 additions & 8 deletions src/storage/localfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use async_trait::async_trait;
use bytes::Bytes;
use datafusion::{datasource::listing::ListingTableUrl, execution::runtime_env::RuntimeEnvBuilder};
use fs_extra::file::CopyOptions;
use futures::{stream::FuturesUnordered, TryStreamExt};
use futures::{stream::FuturesUnordered, StreamExt, TryStreamExt};
use relative_path::{RelativePath, RelativePathBuf};
use tokio::fs::{self, DirEntry};
use tokio_stream::wrappers::ReadDirStream;
Expand Down Expand Up @@ -430,17 +430,16 @@ impl ObjectStorage for LocalFS {
) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError> {
let mut correlations: HashMap<RelativePathBuf, Vec<Bytes>> = HashMap::new();
let users_root_path = self.root.join(USERS_ROOT_DIR);
let directories = ReadDirStream::new(fs::read_dir(&users_root_path).await?);
let users: Vec<DirEntry> = directories.try_collect().await?;
for user in users {
let mut directories = ReadDirStream::new(fs::read_dir(&users_root_path).await?);
while let Some(user) = directories.next().await {
let user = user?;
if !user.path().is_dir() {
continue;
}
let correlations_path = users_root_path.join(user.path()).join("correlations");
let directories = ReadDirStream::new(fs::read_dir(&correlations_path).await?);
let correlations_files: Vec<DirEntry> = directories.try_collect().await?;
for correlation in correlations_files {
let correlation_absolute_path = correlation.path();
let mut files = ReadDirStream::new(fs::read_dir(&correlations_path).await?);
while let Some(correlation) = files.next().await {
let correlation_absolute_path = correlation?.path();
let file = fs::read(correlation_absolute_path.clone()).await?;
let correlation_relative_path = correlation_absolute_path
.strip_prefix(self.root.as_path())
Expand Down
18 changes: 6 additions & 12 deletions src/storage/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,10 +811,8 @@ impl ObjectStorage for S3 {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_dashboard_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "dashboards"
));
let user_dashboard_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
let dashboard_bytes = self
.get_objects(
Expand Down Expand Up @@ -849,10 +847,8 @@ impl ObjectStorage for S3 {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_filters_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "filters"
));
let user_filters_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/filters",));
let resp = self
.client
.list_with_delimiter(Some(&user_filters_path))
Expand Down Expand Up @@ -900,10 +896,8 @@ impl ObjectStorage for S3 {
.map(|name| name.as_ref().to_string())
.collect::<Vec<_>>();
for user in users {
let user_correlation_path = object_store::path::Path::from(format!(
"{}/{}/{}",
USERS_ROOT_DIR, user, "correlations"
));
let user_correlation_path =
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/correlations",));
let correlations_path = RelativePathBuf::from(&user_correlation_path);
let correlation_bytes = self
.get_objects(
Expand Down
Loading