revert: restore PutObjReader and remove PUT zero-copy chunk path (#2351 phase 2) (#2532)

rustfs/src/app/capacity_dirty_scope_test.rs

@@ -18,9 +18,7 @@ use rustfs_ecstore::{
     disk::endpoint::Endpoint,
     endpoints::{EndpointServerPools, Endpoints, PoolEndpoints},
     store::ECStore,
-    store_api::{
-        BucketOperations, BucketOptions, ChunkNativePutData, HealOperations, MakeBucketOptions, ObjectIO, ObjectOptions,
-    },
+    store_api::{BucketOperations, BucketOptions, HealOperations, MakeBucketOptions, ObjectIO, ObjectOptions, PutObjReader},
 };
 use rustfs_object_capacity::capacity_manager::{HybridStrategyConfig, create_isolated_manager};
 use serial_test::serial;
@@ -137,7 +135,7 @@ async fn data_movement_put_object_marks_dirty_disks_for_capacity_manager() {
     let _ = manager.get_dirty_disks().await;
 
     let payload = b"data-movement-dirty-scope".to_vec();
-    let mut reader = ChunkNativePutData::from_vec(payload);
+    let mut reader = PutObjReader::from_vec(payload);
     let opts = ObjectOptions {
         data_movement: true,
         src_pool_idx: 0,
@@ -179,7 +177,7 @@ async fn heal_object_marks_missing_shard_disk_dirty_for_capacity_manager() {
 
     let payload_len = 3 * 1024 * 1024 + 137;
     let payload: Vec<u8> = (0..payload_len).map(|idx| (idx % 251) as u8).collect();
-    let mut reader = ChunkNativePutData::from_vec(payload);
+    let mut reader = PutObjReader::from_vec(payload);
     let object_name = "test/heal.bin";
     let put_info = ecstore
         .put_object(&bucket_name, object_name, &mut reader, &ObjectOptions::default())

rustfs/src/app/lifecycle_transition_api_test.rs

@@ -27,8 +27,8 @@ use rustfs_ecstore::{
     global::GLOBAL_TierConfigMgr,
     store::ECStore,
     store_api::{
-        BucketOperations, BucketOptions, ChunkNativePutData, MakeBucketOptions, MultipartOperations, ObjectIO, ObjectOperations,
-        ObjectOptions,
+        BucketOperations, BucketOptions, MakeBucketOptions, MultipartOperations, ObjectIO, ObjectOperations, ObjectOptions,
+        PutObjReader,
     },
     tier::{
         tier_config::{TierConfig, TierType},
@@ -150,7 +150,7 @@ async fn upload_test_object(
     object: &str,
     data: &[u8],
 ) -> rustfs_ecstore::store_api::ObjectInfo {
-    let mut reader = ChunkNativePutData::from_vec(data.to_vec());
+    let mut reader = PutObjReader::from_vec(data.to_vec());
     (**ecstore)
         .put_object(bucket, object, &mut reader, &ObjectOptions::default())
         .await
@@ -448,7 +448,7 @@ async fn complete_multipart_upload_transitions_immediately_via_usecase() {
         .await
         .expect("Failed to create multipart upload");
 
-    let mut reader = ChunkNativePutData::from_vec(payload.to_vec());
+    let mut reader = PutObjReader::from_vec(payload.to_vec());
     let uploaded_part = ecstore
         .put_object_part(bucket.as_str(), object, &upload.upload_id, 1, &mut reader, &ObjectOptions::default())
         .await

rustfs/src/app/multipart_usecase.rs

@@ -45,9 +45,7 @@ use rustfs_ecstore::compress::is_compressible;
 use rustfs_ecstore::error::{StorageError, is_err_object_not_found, is_err_version_not_found};
 use rustfs_ecstore::new_object_layer_fn;
 use rustfs_ecstore::set_disk::is_valid_storage_class;
-use rustfs_ecstore::store_api::{
-    ChunkNativePutData, CompletePart, HTTPRangeSpec, MultipartUploadResult, ObjectIO, ObjectOptions,
-};
+use rustfs_ecstore::store_api::{CompletePart, HTTPRangeSpec, MultipartUploadResult, ObjectIO, ObjectOptions, PutObjReader};
 use rustfs_ecstore::store_api::{MultipartOperations, ObjectOperations};
 use rustfs_filemeta::{ReplicationStatusType, ReplicationType};
 use rustfs_object_io::put::PutObjectChecksums;
@@ -772,7 +770,7 @@ impl DefaultMultipartUsecase {
             None => (None, None),
         };
 
-        let mut reader = ChunkNativePutData::new(reader);
+        let mut reader = PutObjReader::new(reader);
 
         let info = store
             .put_object_part(&bucket, &key, &upload_id, part_id, &mut reader, &opts)
@@ -813,7 +811,7 @@ impl DefaultMultipartUsecase {
                 _ => (),
             }
         }
-        checksums.merge_from_map(&reader.content_crc());
+        checksums.merge_from_map(&reader.as_hash_reader().content_crc());
 
         let output = UploadPartOutput {
             server_side_encryption: requested_sse,
@@ -1095,7 +1093,7 @@ impl DefaultMultipartUsecase {
             None => (None, None),
         };
 
-        let mut reader = ChunkNativePutData::new(reader);
+        let mut reader = PutObjReader::new(reader);
 
         let dst_opts = ObjectOptions {
             user_defined: mp_info.user_defined.clone(),

rustfs/src/app/object_usecase.rs

@@ -73,7 +73,7 @@ use rustfs_ecstore::error::{StorageError, is_err_bucket_not_found, is_err_object
 use rustfs_ecstore::new_object_layer_fn;
 use rustfs_ecstore::set_disk::is_valid_storage_class;
 use rustfs_ecstore::store_api::{
-    ChunkNativePutData, HTTPRangeSpec, ObjectIO, ObjectInfo, ObjectOperations, ObjectOptions, ObjectToDelete,
+    HTTPRangeSpec, ObjectIO, ObjectInfo, ObjectOperations, ObjectOptions, ObjectToDelete, PutObjReader,
 };
 use rustfs_filemeta::{
     REPLICATE_INCOMING_DELETE, ReplicationStatusType, ReplicationType, RestoreStatusOps, VersionPurgeStatusType,
@@ -1236,7 +1236,7 @@ impl DefaultObjectUsecase {
             src_info.user_defined.extend(material.metadata);
         }
 
-        src_info.put_object_reader = Some(ChunkNativePutData::new(reader));
+        src_info.put_object_reader = Some(PutObjReader::new(reader));
 
         // check quota
 

rustfs/src/app/object_usecase/put_object_extract.rs

@@ -295,7 +295,7 @@ impl DefaultObjectUsecase {
             opts.user_defined.extend(metadata);
             let capacity_scope_token = Uuid::new_v4();
             opts.capacity_scope_token = Some(capacity_scope_token);
-            let mut reader = ChunkNativePutData::new(hrd);
+            let mut reader = PutObjReader::new(hrd);
 
             let obj_info = match store.put_object(&bucket, &fpath, &mut reader, &opts).await {
                 Ok(info) => info,

rustfs/src/app/object_usecase/put_object_flow.rs

@@ -539,7 +539,7 @@ impl DefaultObjectUsecase {
             opts.user_defined.extend(encryption_metadata);
         }
 
-        let mut reader = ChunkNativePutData::new(reader);
+        let mut reader = PutObjReader::new(reader);
 
         let mt2 = metadata.clone();
         opts.user_defined.extend(metadata);
@@ -611,7 +611,7 @@ impl DefaultObjectUsecase {
             &request_context.trailing_headers,
             &mut checksums,
         );
-        checksums.merge_from_map(&reader.content_crc());
+        checksums.merge_from_map(&reader.as_hash_reader().content_crc());
         if let Some(checksum_bytes) = resolved_checksum_bytes(&checksums)
             && obj_info
                 .checksum