wip

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

vortex-bench/src/random_access/take.rs

@@ -25,7 +25,6 @@ use vortex::array::stream::ArrayStreamExt;
 use vortex::buffer::Buffer;
 use vortex::file::OpenOptionsSessionExt;
 use vortex::file::VortexFile;
-use vortex::file::segments::set_io_tracing;
 use vortex::layout::segments::TracingSegmentSource;
 use vortex::utils::aliases::hash_map::HashMap;
 
@@ -81,7 +80,6 @@ impl RandomAccessor for VortexRandomAccessor {
         if let Some(ts) = &self.tracing_source {
             ts.clear();
         }
-        set_io_tracing(true);
 
         let indices_buf: Buffer<u64> = Buffer::from(indices.to_vec());
         let array = self
@@ -92,8 +90,6 @@ impl RandomAccessor for VortexRandomAccessor {
             .read_all()
             .await?;
 
-        set_io_tracing(false);
-
         if let Some(ts) = &self.tracing_source {
             eprintln!("\n=== Logical Segment Requests ===");
             ts.dump();

vortex-file/src/read/driver.rs

@@ -311,20 +311,6 @@ impl State {
             current_end - aligned_start,
         );
 
-        if crate::segments::IO_TRACING_ENABLED.load(std::sync::atomic::Ordering::Relaxed) {
-            let sub_reqs: Vec<String> = requests
-                .iter()
-                .map(|r| format!("id={} off={} len={}", r.id, r.offset, r.length))
-                .collect();
-            eprintln!(
-                "  [coalesced] range={}..{} bytes={:<10} sub_reqs=[{}]",
-                aligned_start,
-                current_end,
-                current_end - aligned_start,
-                sub_reqs.join(", "),
-            );
-        }
-
         Some(CoalescedRequest {
             range: aligned_start..current_end,
             alignment: self.coalesced_buffer_alignment,

vortex-file/src/segments/source.rs

@@ -9,16 +9,6 @@ use std::sync::atomic::Ordering;
 use std::task::Context;
 use std::task::Poll;
 
-use std::sync::atomic::AtomicBool;
-
-/// Global flag to enable I/O tracing output.
-pub static IO_TRACING_ENABLED: AtomicBool = AtomicBool::new(false);
-
-/// Enable or disable I/O tracing output printed to stdout.
-pub fn set_io_tracing(enabled: bool) {
-    IO_TRACING_ENABLED.store(enabled, Ordering::Relaxed);
-}
-
 use futures::FutureExt;
 use futures::StreamExt;
 use futures::channel::mpsc;
@@ -132,24 +122,13 @@ impl FileSegmentSource {
         )
         .boxed();
 
-        let pread_counter = Arc::new(AtomicUsize::new(0));
         let drive_fut = async move {
             stream
                 .map(move |req| {
                     let reader = reader.clone();
-                    let pread_counter = Arc::clone(&pread_counter);
                     async move {
-                        let offset = req.offset();
-                        let len = req.len();
-                        if IO_TRACING_ENABLED.load(Ordering::Relaxed) {
-                            let order = pread_counter.fetch_add(1, Ordering::Relaxed);
-                            eprintln!(
-                                "  [pread #{:<3}] offset={:<14} bytes={:<10}",
-                                order, offset, len,
-                            );
-                        }
                         let result = reader
-                            .read_at(offset, len, req.alignment())
+                            .read_at(req.offset(), req.len(), req.alignment())
                             .await;
                         req.resolve(result);
                     }