mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-31 17:28:12 +00:00
chore(ecstore): fold the ListObjects forwarders into the ECStore impl
store/list.rs held two thin forwarders, handle_list_objects_v2 and handle_list_object_versions, that only re-entered the inner_* implementations. The ListOperations impl now calls those directly and the file goes away. The logging guardrail's trace_hot_spans list pinned handle_list_objects_v2 as TRACE-only; that entry is retired in the same diff, adjacent to the sets.rs entry retired by the preceding commit. Ref rustfs/backlog#1821.
This commit is contained in:
@@ -1,81 +0,0 @@
|
|||||||
// Copyright 2024 RustFS Team
|
|
||||||
//
|
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
// you may not use this file except in compliance with the License.
|
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
impl ECStore {
|
|
||||||
#[instrument(level = "trace", skip(self))]
|
|
||||||
#[allow(clippy::too_many_arguments)]
|
|
||||||
pub(super) async fn handle_list_objects_v2(
|
|
||||||
self: Arc<Self>,
|
|
||||||
bucket: &str,
|
|
||||||
prefix: &str,
|
|
||||||
continuation_token: Option<String>,
|
|
||||||
delimiter: Option<String>,
|
|
||||||
max_keys: i32,
|
|
||||||
fetch_owner: bool,
|
|
||||||
start_after: Option<String>,
|
|
||||||
incl_deleted: bool,
|
|
||||||
) -> Result<ListObjectsV2Info> {
|
|
||||||
self.inner_list_objects_v2(
|
|
||||||
bucket,
|
|
||||||
prefix,
|
|
||||||
continuation_token,
|
|
||||||
delimiter,
|
|
||||||
max_keys,
|
|
||||||
fetch_owner,
|
|
||||||
start_after,
|
|
||||||
incl_deleted,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
#[instrument(skip(self))]
|
|
||||||
pub(super) async fn handle_list_object_versions(
|
|
||||||
self: Arc<Self>,
|
|
||||||
bucket: &str,
|
|
||||||
prefix: &str,
|
|
||||||
marker: Option<String>,
|
|
||||||
version_marker: Option<String>,
|
|
||||||
delimiter: Option<String>,
|
|
||||||
max_keys: i32,
|
|
||||||
) -> Result<ListObjectVersionsInfo> {
|
|
||||||
self.inner_list_object_versions(bucket, prefix, marker, version_marker, delimiter, max_keys)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) async fn list_object_versions_for_lifecycle(
|
|
||||||
self: Arc<Self>,
|
|
||||||
bucket: &str,
|
|
||||||
prefix: &str,
|
|
||||||
marker: Option<String>,
|
|
||||||
version_marker: Option<String>,
|
|
||||||
delimiter: Option<String>,
|
|
||||||
max_keys: i32,
|
|
||||||
) -> Result<ListObjectVersionsInfo> {
|
|
||||||
self.inner_list_object_versions_for_lifecycle(bucket, prefix, marker, version_marker, delimiter, max_keys)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(super) async fn handle_walk(
|
|
||||||
self: Arc<Self>,
|
|
||||||
rx: CancellationToken,
|
|
||||||
bucket: &str,
|
|
||||||
prefix: &str,
|
|
||||||
result: tokio::sync::mpsc::Sender<ObjectInfoOrErr>,
|
|
||||||
opts: WalkOptions,
|
|
||||||
) -> Result<()> {
|
|
||||||
self.walk_internal(rx, bucket, prefix, result, opts).await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3844,7 +3844,7 @@ impl ECStore {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn inner_list_object_versions_for_lifecycle(
|
pub(crate) async fn list_object_versions_for_lifecycle(
|
||||||
self: Arc<Self>,
|
self: Arc<Self>,
|
||||||
bucket: &str,
|
bucket: &str,
|
||||||
prefix: &str,
|
prefix: &str,
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ mod heal_walk;
|
|||||||
pub use heal_walk::HealWalkVersion;
|
pub use heal_walk::HealWalkVersion;
|
||||||
mod init;
|
mod init;
|
||||||
pub(crate) mod init_format;
|
pub(crate) mod init_format;
|
||||||
mod list;
|
|
||||||
pub(crate) mod list_objects;
|
pub(crate) mod list_objects;
|
||||||
mod multipart;
|
mod multipart;
|
||||||
mod object;
|
mod object;
|
||||||
@@ -601,7 +600,7 @@ impl crate::storage_api_contracts::list::ListOperations for ECStore {
|
|||||||
start_after: Option<String>,
|
start_after: Option<String>,
|
||||||
incl_deleted: bool,
|
incl_deleted: bool,
|
||||||
) -> Result<ListObjectsV2Info> {
|
) -> Result<ListObjectsV2Info> {
|
||||||
self.handle_list_objects_v2(
|
self.inner_list_objects_v2(
|
||||||
bucket,
|
bucket,
|
||||||
prefix,
|
prefix,
|
||||||
continuation_token,
|
continuation_token,
|
||||||
@@ -624,7 +623,7 @@ impl crate::storage_api_contracts::list::ListOperations for ECStore {
|
|||||||
delimiter: Option<String>,
|
delimiter: Option<String>,
|
||||||
max_keys: i32,
|
max_keys: i32,
|
||||||
) -> Result<ListObjectVersionsInfo> {
|
) -> Result<ListObjectVersionsInfo> {
|
||||||
self.handle_list_object_versions(bucket, prefix, marker, version_marker, delimiter, max_keys)
|
self.inner_list_object_versions(bucket, prefix, marker, version_marker, delimiter, max_keys)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -636,7 +635,7 @@ impl crate::storage_api_contracts::list::ListOperations for ECStore {
|
|||||||
result: tokio::sync::mpsc::Sender<ObjectInfoOrErr>,
|
result: tokio::sync::mpsc::Sender<ObjectInfoOrErr>,
|
||||||
opts: WalkOptions,
|
opts: WalkOptions,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
self.handle_walk(rx, bucket, prefix, result, opts).await
|
self.walk_internal(rx, bucket, prefix, result, opts).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -984,7 +984,9 @@ trace_hot_spans=(
|
|||||||
"crates/ecstore/src/store/object.rs:handle_get_object_info"
|
"crates/ecstore/src/store/object.rs:handle_get_object_info"
|
||||||
"crates/ecstore/src/set_disk/ops/object.rs:get_object_info"
|
"crates/ecstore/src/set_disk/ops/object.rs:get_object_info"
|
||||||
"crates/ecstore/src/store/mod.rs:list_objects_v2"
|
"crates/ecstore/src/store/mod.rs:list_objects_v2"
|
||||||
"crates/ecstore/src/store/list.rs:handle_list_objects_v2"
|
# The ECStore handle_list_objects_v2 forwarder was folded into the trait impl
|
||||||
|
# above, so store/mod.rs now carries this hot path's TRACE requirement
|
||||||
|
# directly (backlog#1821).
|
||||||
# The pool-level Sets::list_objects_v2 wrapper was removed with its duplicate
|
# The pool-level Sets::list_objects_v2 wrapper was removed with its duplicate
|
||||||
# pagination pipeline (backlog#1821); the remaining ECStore and SetDisks
|
# pagination pipeline (backlog#1821); the remaining ECStore and SetDisks
|
||||||
# wrappers below still carry the TRACE requirement.
|
# wrappers below still carry the TRACE requirement.
|
||||||
|
|||||||
Reference in New Issue
Block a user