use Bytes instead of static slice

awslabs · Aug 12, 2024 · 6e34bff · 6e34bff
1 parent 4d60f41
commit 6e34bff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/runners/s3-benchrunner-rust/Cargo.lock b/runners/s3-benchrunner-rust/Cargo.lock
diff --git a/runners/s3-benchrunner-rust/Cargo.toml b/runners/s3-benchrunner-rust/Cargo.toml
@@ -16,3 +16,4 @@ serde_json = "1.0.120"
 thiserror = "1.0.62"
 tokio = { version = "1.38.1", features = ["io-util"] }
 rand = "0.8.4"
+bytes = "1"
diff --git a/runners/s3-benchrunner-rust/src/transfer_manager.rs b/runners/s3-benchrunner-rust/src/transfer_manager.rs
@@ -13,7 +13,10 @@ use tokio::task::JoinSet;
 
 use crate::{
     BenchmarkConfig, Result, RunBenchmark, RunnerError, TaskAction, TaskConfig, PART_SIZE,
+
 };
+use bytes::Bytes;
+
 
 /// Benchmark runner using aws-s3-transfer-manager
 #[derive(Clone)]
@@ -24,7 +27,7 @@ pub struct TransferManagerRunner {
 struct Handle {
     config: BenchmarkConfig,
     transfer_manager: aws_s3_transfer_manager::Client,
-    random_data_for_upload:&'static [u8]
+    random_data_for_upload: Bytes,
 }
 
 impl TransferManagerRunner {
@@ -52,8 +55,11 @@ impl TransferManagerRunner {
                 .try_into()
                 .unwrap()
         };
-        let mut random_data_for_upload = Vec::new(); 
-        random_data_for_upload.resize_with(upload_data_size, rand::random::<u8>);
+        let random_data_for_upload: Bytes = {
+            let mut data = Vec::new(); 
+            data.resize_with(upload_data_size, rand::random::<u8>);
+            data.into()
+        };
 
         let s3_client = aws_sdk_s3::Client::new(&sdk_config);
         let tm_config = aws_s3_transfer_manager::Config::builder()
@@ -68,7 +74,7 @@ impl TransferManagerRunner {
             handle: Arc::new(Handle {
                 config,
                 transfer_manager,
-                random_data_for_upload: Box::leak(random_data_for_upload.into_boxed_slice()),
+                random_data_for_upload,
             }),
         }
     }
@@ -139,9 +145,10 @@ impl TransferManagerRunner {
 
         let stream = match self.config().workload.files_on_disk {
             true => InputStream::from_path(key).with_context(|| "Failed to create stream")?,
-            false => InputStream::from_static(self.handle.random_data_for_upload), 
+            false => self.handle.random_data_for_upload.clone().into(), 
         };
 
+
         self.handle
             .transfer_manager
             .upload()