@@ -103,9 +103,10 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
103
103
104
104
let users_dir = RelativePathBuf :: from_iter ( [ USERS_ROOT_DIR ] ) ;
105
105
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" ] ) ;
107
107
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] ) ;
109
110
let filter_bytes = self
110
111
. get_objects (
111
112
Some ( & filters_path) ,
@@ -118,6 +119,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
118
119
. extend ( filter_bytes) ;
119
120
}
120
121
}
122
+
121
123
Ok ( filters)
122
124
}
123
125
@@ -128,9 +130,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
128
130
129
131
let users_dir = RelativePathBuf :: from_iter ( [ USERS_ROOT_DIR ] ) ;
130
132
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" ] ) ;
134
134
let dashboard_bytes = self
135
135
. get_objects (
136
136
Some ( & dashboards_path) ,
@@ -143,6 +143,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
143
143
. or_default ( )
144
144
. extend ( dashboard_bytes) ;
145
145
}
146
+
146
147
Ok ( dashboards)
147
148
}
148
149
@@ -155,9 +156,8 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
155
156
156
157
let users_dir = RelativePathBuf :: from_iter ( [ USERS_ROOT_DIR ] ) ;
157
158
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" ] ) ;
161
161
let correlation_bytes = self
162
162
. get_objects (
163
163
Some ( & correlations_path) ,
@@ -170,6 +170,7 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
170
170
. or_default ( )
171
171
. extend ( correlation_bytes) ;
172
172
}
173
+
173
174
Ok ( correlations)
174
175
}
175
176
0 commit comments