Skip to content

Commit 82322c2

Browse files
committed
fix: format -> join_dir
Signed-off-by: Zhenchi <zhongzc_arch@outlook.com>
1 parent da6e0de commit 82322c2

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/mito2/src/cache/write_cache.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ mod tests {
222222
use common_test_util::temp_dir::create_temp_dir;
223223
use object_store::manager::ObjectStoreManager;
224224
use object_store::services::Fs;
225+
use object_store::util::join_path;
225226
use object_store::ObjectStore;
226227
use store_api::storage::RegionId;
227228

@@ -245,7 +246,7 @@ mod tests {
245246
let file_id = FileId::random();
246247
let upload_path = sst_file_path("test", file_id);
247248
let index_upload_path = index_file_path("test", file_id);
248-
let intm_mgr = IntermediateManager::init_fs(format!("{data_home}/intermediate"))
249+
let intm_mgr = IntermediateManager::init_fs(join_path(&data_home, "intm"))
249250
.await
250251
.unwrap();
251252

src/mito2/src/sst/file_purger.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ impl FilePurger for LocalFilePurger {
9797
mod tests {
9898
use common_test_util::temp_dir::create_temp_dir;
9999
use object_store::services::Fs;
100+
use object_store::util::join_path;
100101
use object_store::ObjectStore;
101102
use smallvec::SmallVec;
102103

@@ -118,7 +119,7 @@ mod tests {
118119
let sst_file_id = FileId::random();
119120
let sst_dir = "table1";
120121
let path = location::sst_file_path(sst_dir, sst_file_id);
121-
let intm_mgr = IntermediateManager::init_fs(format!("{dir_path}/intm"))
122+
let intm_mgr = IntermediateManager::init_fs(join_path(&dir_path, "intm"))
122123
.await
123124
.unwrap();
124125

@@ -162,7 +163,7 @@ mod tests {
162163
builder.root(&dir_path);
163164
let sst_file_id = FileId::random();
164165
let sst_dir = "table1";
165-
let intm_mgr = IntermediateManager::init_fs(format!("{dir_path}/intm"))
166+
let intm_mgr = IntermediateManager::init_fs(join_path(&dir_path, "intm"))
166167
.await
167168
.unwrap();
168169
let path = location::sst_file_path(sst_dir, sst_file_id);

src/mito2/src/sst/index/creator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl SstIndexCreator {
125125
if let Err(update_err) = self.do_update(batch).await {
126126
// clean up garbage if failed to update
127127
if let Err(err) = self.do_cleanup().await {
128-
warn!(err; "Failed to clean up index creator");
128+
warn!(err; "Failed to clean up index creator, file_path: {}", self.file_path);
129129
}
130130
return Err(update_err);
131131
}
@@ -146,7 +146,7 @@ impl SstIndexCreator {
146146
let finish_res = self.do_finish().await;
147147
// clean up garbage no matter finish successfully or not
148148
if let Err(err) = self.do_cleanup().await {
149-
warn!(err; "Failed to clean up index creator");
149+
warn!(err; "Failed to clean up index creator, file_path: {}", self.file_path);
150150
}
151151

152152
finish_res.map(|_| (self.stats.row_count(), self.stats.byte_count()))

src/mito2/src/test_util/scheduler_util.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use std::sync::Arc;
1818

1919
use common_test_util::temp_dir::{create_temp_dir, TempDir};
2020
use object_store::services::Fs;
21+
use object_store::util::join_dir;
2122
use object_store::ObjectStore;
2223
use tokio::sync::mpsc::Sender;
2324

@@ -46,7 +47,7 @@ impl SchedulerEnv {
4647
let mut builder = Fs::default();
4748
builder.root(&path_str);
4849

49-
let intm_mgr = IntermediateManager::init_fs(join_dir(path_str, "interm"))
50+
let intm_mgr = IntermediateManager::init_fs(join_dir(&path_str, "intm"))
5051
.await
5152
.unwrap();
5253
let object_store = ObjectStore::new(builder).unwrap().finish();

0 commit comments

Comments
 (0)