Skip to content

Commit 43485ee

Browse files
committed
fix test
1 parent 1b194b1 commit 43485ee

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

be/src/service/staros_worker.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ absl::StatusOr<std::shared_ptr<fslib::FileSystem>> StarOSWorker::get_shard_files
230230

231231
// Build the filesystem under no lock, so the op won't hold the lock for a long time.
232232
// It is possible that multiple filesystems are built for the same shard from multiple threads under no lock here.
233-
auto fs_or = build_filesystem_from_shard_info(id, shard_info, conf);
233+
auto fs_or = build_filesystem_from_shard_info(shard_info, conf);
234234
if (!fs_or.ok()) {
235235
return fs_or.status();
236236
}
@@ -272,7 +272,7 @@ absl::StatusOr<std::shared_ptr<fslib::FileSystem>> StarOSWorker::build_filesyste
272272
if (!info_or.ok()) {
273273
return info_or.status();
274274
}
275-
auto fs_or = build_filesystem_from_shard_info(id, info_or.value(), conf);
275+
auto fs_or = build_filesystem_from_shard_info(info_or.value(), conf);
276276
if (!fs_or.ok()) {
277277
return fs_or.status();
278278
}
@@ -282,7 +282,7 @@ absl::StatusOr<std::shared_ptr<fslib::FileSystem>> StarOSWorker::build_filesyste
282282
}
283283

284284
absl::StatusOr<std::pair<std::shared_ptr<std::string>, std::shared_ptr<fslib::FileSystem>>>
285-
StarOSWorker::build_filesystem_from_shard_info(ShardId shard_id, const ShardInfo& info, const Configuration& conf) {
285+
StarOSWorker::build_filesystem_from_shard_info(const ShardInfo& info, const Configuration& conf) {
286286
auto localconf = build_conf_from_shard_info(info);
287287
if (!localconf.ok()) {
288288
return localconf.status();
@@ -292,7 +292,7 @@ StarOSWorker::build_filesystem_from_shard_info(ShardId shard_id, const ShardInfo
292292
return scheme.status();
293293
}
294294

295-
return new_shared_filesystem(shard_id, *scheme, *localconf);
295+
return new_shared_filesystem(info.id, *scheme, *localconf);
296296
}
297297

298298
bool StarOSWorker::need_enable_cache(const ShardInfo& info) {

be/src/service/staros_worker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class StarOSWorker : public staros::starlet::Worker {
123123

124124
absl::StatusOr<std::shared_ptr<FileSystem>> build_filesystem_on_demand(ShardId id, const Configuration& conf);
125125
absl::StatusOr<std::pair<std::shared_ptr<std::string>, std::shared_ptr<FileSystem>>>
126-
build_filesystem_from_shard_info(ShardId shard_id, const ShardInfo& info, const Configuration& conf);
126+
build_filesystem_from_shard_info(const ShardInfo& info, const Configuration& conf);
127127
absl::StatusOr<std::pair<std::shared_ptr<std::string>, std::shared_ptr<FileSystem>>> new_shared_filesystem(
128128
ShardId shard_id, std::string_view scheme, const Configuration& conf);
129129
absl::Status invalidate_fs(const ShardInfo& shard);

0 commit comments

Comments
 (0)