Skip to content

Commit 3227d98

Browse files
author
Devdutt Shenoi
committed
fix+refactor: user file location
1 parent cfd6989 commit 3227d98

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/storage/object_storage.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
103103

104104
let users_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR]);
105105
for user in self.list_dirs_relative(&users_dir).await? {
106-
let stream_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR, &user]);
106+
let stream_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR, &user, "filters"]);
107107
for stream in self.list_dirs_relative(&stream_dir).await? {
108-
let filters_path = RelativePathBuf::from(&stream);
108+
let filters_path =
109+
RelativePathBuf::from_iter([USERS_ROOT_DIR, &user, "filters", &stream]);
109110
let filter_bytes = self
110111
.get_objects(
111112
Some(&filters_path),
@@ -118,6 +119,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
118119
.extend(filter_bytes);
119120
}
120121
}
122+
121123
Ok(filters)
122124
}
123125

@@ -128,9 +130,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
128130

129131
let users_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR]);
130132
for user in self.list_dirs_relative(&users_dir).await? {
131-
let user_dashboard_path =
132-
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
133-
let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
133+
let dashboards_path = RelativePathBuf::from_iter([USERS_ROOT_DIR, &user, "dashboards"]);
134134
let dashboard_bytes = self
135135
.get_objects(
136136
Some(&dashboards_path),
@@ -143,6 +143,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
143143
.or_default()
144144
.extend(dashboard_bytes);
145145
}
146+
146147
Ok(dashboards)
147148
}
148149

@@ -155,9 +156,8 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
155156

156157
let users_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR]);
157158
for user in self.list_dirs_relative(&users_dir).await? {
158-
let user_correlation_path =
159-
object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/correlations",));
160-
let correlations_path = RelativePathBuf::from(&user_correlation_path);
159+
let correlations_path =
160+
RelativePathBuf::from_iter([USERS_ROOT_DIR, &user, "correlations"]);
161161
let correlation_bytes = self
162162
.get_objects(
163163
Some(&correlations_path),
@@ -170,6 +170,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
170170
.or_default()
171171
.extend(correlation_bytes);
172172
}
173+
173174
Ok(correlations)
174175
}
175176

0 commit comments

Comments
 (0)