refactor: move multipart DTO contracts (#3505)

crates/ecstore/src/set_disk.rs

@@ -34,8 +34,8 @@ use crate::error::{Error, Result, is_err_version_not_found};
 use crate::error::{GenericError, ObjectApiError, is_err_object_not_found};
 use crate::global::{GLOBAL_LocalNodeName, GLOBAL_TierConfigMgr};
 use crate::store_api::ListObjectVersionsInfo;
-use crate::store_api::{ListPartsInfo, ObjectOptions, ObjectToDelete};
 use crate::store_api::{ObjectInfoOrErr, WalkOptions};
+use crate::store_api::{ObjectOptions, ObjectToDelete};
 use crate::{
     bucket::lifecycle::bucket_lifecycle_ops::{
         LifecycleOps, gen_transition_objname, get_transitioned_object_reader, put_restore_opts,
@@ -52,9 +52,8 @@ use crate::{
     event_notification::{EventArgs, send_event},
     global::{GLOBAL_LOCAL_DISK_MAP, GLOBAL_LOCAL_DISK_SET_DRIVES, get_global_deployment_id, is_dist_erasure},
     store_api::{
-        BucketOperations, CompletePart, DeletedObject, GetObjectReader, HTTPRangeSpec, HealOperations, ListMultipartsInfo,
-        ListObjectsV2Info, ListOperations, MultipartInfo, MultipartOperations, MultipartUploadResult, NamespaceLocking, ObjectIO,
-        ObjectInfo, ObjectOperations, PartInfo, PutObjReader,
+        BucketOperations, CompletePart, DeletedObject, GetObjectReader, HTTPRangeSpec, HealOperations, ListObjectsV2Info,
+        ListOperations, MultipartOperations, NamespaceLocking, ObjectIO, ObjectInfo, ObjectOperations, PutObjReader,
     },
     store_init::load_format_erasure,
 };
@@ -86,7 +85,10 @@ use rustfs_object_capacity::capacity_scope::{
     CapacityScope, CapacityScopeDisk, record_capacity_scope, record_global_dirty_scope,
 };
 use rustfs_s3_types::EventName;
-use rustfs_storage_api::{BucketInfo, BucketOptions, DeleteBucketOptions, MakeBucketOptions};
+use rustfs_storage_api::{
+    BucketInfo, BucketOptions, DeleteBucketOptions, ListMultipartsInfo, ListPartsInfo, MakeBucketOptions, MultipartInfo,
+    MultipartUploadResult, PartInfo,
+};
 use rustfs_utils::http::headers::AMZ_OBJECT_TAGGING;
 use rustfs_utils::http::headers::AMZ_STORAGE_CLASS;
 use rustfs_utils::http::headers::{

crates/ecstore/src/sets.rs

@@ -15,7 +15,7 @@
 
 use crate::disk::error_reduce::count_errs;
 use crate::error::{Error, Result};
-use crate::store_api::{ListPartsInfo, ObjectInfoOrErr, WalkOptions};
+use crate::store_api::{ObjectInfoOrErr, WalkOptions};
 use crate::{
     disk::{
         DiskAPI, DiskInfo, DiskOption, DiskStore,
@@ -28,9 +28,9 @@ use crate::{
     global::{GLOBAL_LOCAL_DISK_SET_DRIVES, get_global_lock_clients, is_dist_erasure},
     set_disk::SetDisks,
     store_api::{
-        BucketOperations, CompletePart, DeletedObject, GetObjectReader, HTTPRangeSpec, HealOperations, ListMultipartsInfo,
-        ListObjectVersionsInfo, ListObjectsV2Info, ListOperations, MultipartInfo, MultipartOperations, MultipartUploadResult,
-        NamespaceLocking, ObjectIO, ObjectInfo, ObjectOperations, ObjectOptions, ObjectToDelete, PartInfo, PutObjReader,
+        BucketOperations, CompletePart, DeletedObject, GetObjectReader, HTTPRangeSpec, HealOperations, ListObjectVersionsInfo,
+        ListObjectsV2Info, ListOperations, MultipartOperations, NamespaceLocking, ObjectIO, ObjectInfo, ObjectOperations,
+        ObjectOptions, ObjectToDelete, PutObjReader,
     },
     store_init::{check_format_erasure_values, get_format_erasure_in_quorum, load_format_erasure_all, save_format_file},
 };
@@ -48,7 +48,10 @@ use rustfs_filemeta::FileInfo;
 use rustfs_lock::NamespaceLockWrapper;
 use rustfs_lock::client::LockClient;
 use rustfs_madmin::heal_commands::{HealDriveInfo, HealResultItem};
-use rustfs_storage_api::{BucketInfo, BucketOptions, DeleteBucketOptions, MakeBucketOptions};
+use rustfs_storage_api::{
+    BucketInfo, BucketOptions, DeleteBucketOptions, ListMultipartsInfo, ListPartsInfo, MakeBucketOptions, MultipartInfo,
+    MultipartUploadResult, PartInfo,
+};
 use rustfs_utils::{crc_hash, path::path_join_buf, sip_hash};
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLock;

crates/ecstore/src/store.rs

@@ -53,9 +53,7 @@ use crate::notification_sys::get_global_notification_sys;
 use crate::pools::PoolMeta;
 use crate::rebalance::RebalanceMeta;
 use crate::rpc::RemoteClient;
-use crate::store_api::{
-    ListMultipartsInfo, ListObjectVersionsInfo, ListPartsInfo, MultipartInfo, ObjectIO, ObjectInfoOrErr, WalkOptions,
-};
+use crate::store_api::{ListObjectVersionsInfo, ObjectIO, ObjectInfoOrErr, WalkOptions};
 use crate::store_init::{check_disk_fatal_errs, ec_drives_no_config};
 use crate::tier::tier::TierConfigMgr;
 use crate::{
@@ -66,8 +64,8 @@ use crate::{
     sets::Sets,
     store_api::{
         BucketOperations, CompletePart, DeletedObject, GetObjectReader, HTTPRangeSpec, HealOperations, ListObjectsV2Info,
-        ListOperations, MultipartOperations, MultipartUploadResult, NamespaceLocking, ObjectInfo, ObjectOperations,
-        ObjectOptions, ObjectToDelete, PartInfo, PutObjReader,
+        ListOperations, MultipartOperations, NamespaceLocking, ObjectInfo, ObjectOperations, ObjectOptions, ObjectToDelete,
+        PutObjReader,
     },
     store_init,
 };
@@ -81,7 +79,10 @@ use rustfs_config::server_config::{Config, get_global_server_config, set_global_
 use rustfs_filemeta::FileInfo;
 use rustfs_lock::{LocalClient, LockClient, NamespaceLockWrapper};
 use rustfs_madmin::heal_commands::HealResultItem;
-use rustfs_storage_api::{BucketInfo, BucketOptions, DeleteBucketOptions, MakeBucketOptions};
+use rustfs_storage_api::{
+    BucketInfo, BucketOptions, DeleteBucketOptions, ListMultipartsInfo, ListPartsInfo, MakeBucketOptions, MultipartInfo,
+    MultipartUploadResult, PartInfo,
+};
 use rustfs_utils::path::{decode_dir_object, encode_dir_object, path_join_buf};
 use s3s::dto::{BucketVersioningStatus, ObjectLockConfiguration, ObjectLockEnabled, VersioningConfiguration};
 use std::cmp::Ordering;

crates/ecstore/src/store_api/traits.rs

@@ -1,5 +1,8 @@
 use super::*;
-use rustfs_storage_api::{BucketInfo, BucketOptions, DeleteBucketOptions, MakeBucketOptions};
+use rustfs_storage_api::{
+    BucketInfo, BucketOptions, DeleteBucketOptions, ListMultipartsInfo, ListPartsInfo, MakeBucketOptions, MultipartInfo,
+    MultipartUploadResult, PartInfo,
+};
 
 #[async_trait::async_trait]
 pub trait ObjectIO: Send + Sync + Debug + 'static {

crates/ecstore/src/store_api/types.rs

@@ -200,22 +200,6 @@ fn is_modified_since(mod_time: &OffsetDateTime, given_time: &OffsetDateTime) ->
     mod_secs > given_secs
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct MultipartUploadResult {
-    pub upload_id: String,
-    pub checksum_algo: Option<String>,
-    pub checksum_type: Option<String>,
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct PartInfo {
-    pub part_num: usize,
-    pub last_mod: Option<OffsetDateTime>,
-    pub size: usize,
-    pub etag: Option<String>,
-    pub actual_size: i64,
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct CompletePart {
     pub part_num: usize,
@@ -871,113 +855,6 @@ pub struct ListObjectsV2Info {
     pub prefixes: Vec<String>,
 }
 
-#[derive(Debug, Clone, Default)]
-pub struct MultipartInfo {
-    // Name of the bucket.
-    pub bucket: String,
-
-    // Name of the object.
-    pub object: String,
-
-    // Upload ID identifying the multipart upload whose parts are being listed.
-    pub upload_id: String,
-
-    // Date and time at which the multipart upload was initiated.
-    pub initiated: Option<OffsetDateTime>,
-
-    // Any metadata set during InitMultipartUpload, including encryption headers.
-    pub user_defined: HashMap<String, String>,
-}
-
-// ListMultipartsInfo - represents bucket resources for incomplete multipart uploads.
-#[derive(Debug, Clone, Default)]
-pub struct ListMultipartsInfo {
-    // Together with upload-id-marker, this parameter specifies the multipart upload
-    // after which listing should begin.
-    pub key_marker: Option<String>,
-
-    // Together with key-marker, specifies the multipart upload after which listing
-    // should begin. If key-marker is not specified, the upload-id-marker parameter
-    // is ignored.
-    pub upload_id_marker: Option<String>,
-
-    // When a list is truncated, this element specifies the value that should be
-    // used for the key-marker request parameter in a subsequent request.
-    pub next_key_marker: Option<String>,
-
-    // When a list is truncated, this element specifies the value that should be
-    // used for the upload-id-marker request parameter in a subsequent request.
-    pub next_upload_id_marker: Option<String>,
-
-    // Maximum number of multipart uploads that could have been included in the
-    // response.
-    pub max_uploads: usize,
-
-    // Indicates whether the returned list of multipart uploads is truncated. A
-    // value of true indicates that the list was truncated. The list can be truncated
-    // if the number of multipart uploads exceeds the limit allowed or specified
-    // by max uploads.
-    pub is_truncated: bool,
-
-    // List of all pending uploads.
-    pub uploads: Vec<MultipartInfo>,
-
-    // When a prefix is provided in the request, The result contains only keys
-    // starting with the specified prefix.
-    pub prefix: String,
-
-    // A character used to truncate the object prefixes.
-    // NOTE: only supported delimiter is '/'.
-    pub delimiter: Option<String>,
-
-    // CommonPrefixes contains all (if there are any) keys between Prefix and the
-    // next occurrence of the string specified by delimiter.
-    pub common_prefixes: Vec<String>,
-    // encoding_type: String, // Not supported yet.
-}
-
-/// ListPartsInfo - represents list of all parts.
-#[derive(Debug, Clone, Default)]
-pub struct ListPartsInfo {
-    /// Name of the bucket.
-    pub bucket: String,
-
-    /// Name of the object.
-    pub object: String,
-
-    /// Upload ID identifying the multipart upload whose parts are being listed.
-    pub upload_id: String,
-
-    /// The class of storage used to store the object.
-    pub storage_class: String,
-
-    /// Part number after which listing begins.
-    pub part_number_marker: usize,
-
-    /// When a list is truncated, this element specifies the last part in the list,
-    /// as well as the value to use for the part-number-marker request parameter
-    /// in a subsequent request.
-    pub next_part_number_marker: usize,
-
-    /// Maximum number of parts that were allowed in the response.
-    pub max_parts: usize,
-
-    /// Indicates whether the returned list of parts is truncated.
-    pub is_truncated: bool,
-
-    /// List of all parts.
-    pub parts: Vec<PartInfo>,
-
-    /// Any metadata set during InitMultipartUpload, including encryption headers.
-    pub user_defined: HashMap<String, String>,
-
-    /// ChecksumAlgorithm if set
-    pub checksum_algorithm: String,
-
-    /// ChecksumType if set
-    pub checksum_type: String,
-}
-
 #[derive(Debug, Default, Clone)]
 pub struct ObjectToDelete {
     pub object_name: String,

crates/storage-api/src/lib.rs

@@ -17,7 +17,9 @@
 pub mod admin;
 pub mod bucket;
 pub mod error;
+pub mod multipart;
 
 pub use admin::{DiskSetSelector, StorageAdminApi};
 pub use bucket::{BucketInfo, BucketOptions, DeleteBucketOptions, MakeBucketOptions, SRBucketDeleteOp};
 pub use error::{StorageErrorCode, StorageResult};
+pub use multipart::{ListMultipartsInfo, ListPartsInfo, MultipartInfo, MultipartUploadResult, PartInfo};

crates/storage-api/src/multipart.rs

@@ -0,0 +1,71 @@
+// 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 std::collections::HashMap;
+use time::OffsetDateTime;
+
+#[derive(Debug, Default, Clone)]
+pub struct MultipartUploadResult {
+    pub upload_id: String,
+    pub checksum_algo: Option<String>,
+    pub checksum_type: Option<String>,
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct PartInfo {
+    pub part_num: usize,
+    pub last_mod: Option<OffsetDateTime>,
+    pub size: usize,
+    pub etag: Option<String>,
+    pub actual_size: i64,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct MultipartInfo {
+    pub bucket: String,
+    pub object: String,
+    pub upload_id: String,
+    pub initiated: Option<OffsetDateTime>,
+    pub user_defined: HashMap<String, String>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct ListMultipartsInfo {
+    pub key_marker: Option<String>,
+    pub upload_id_marker: Option<String>,
+    pub next_key_marker: Option<String>,
+    pub next_upload_id_marker: Option<String>,
+    pub max_uploads: usize,
+    pub is_truncated: bool,
+    pub uploads: Vec<MultipartInfo>,
+    pub prefix: String,
+    pub delimiter: Option<String>,
+    pub common_prefixes: Vec<String>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct ListPartsInfo {
+    pub bucket: String,
+    pub object: String,
+    pub upload_id: String,
+    pub storage_class: String,
+    pub part_number_marker: usize,
+    pub next_part_number_marker: usize,
+    pub max_parts: usize,
+    pub is_truncated: bool,
+    pub parts: Vec<PartInfo>,
+    pub user_defined: HashMap<String, String>,
+    pub checksum_algorithm: String,
+    pub checksum_type: String,
+}