blackmwk commented on code in PR #2349:
URL: https://github.com/apache/iceberg-rust/pull/2349#discussion_r3145355845
##########
crates/iceberg/src/io/file_io.rs:
##########
@@ -255,6 +255,13 @@ pub trait FileRead: Send + Sync + Unpin + 'static {
async fn read(&self, range: Range<u64>) -> crate::Result<Bytes>;
}
+#[async_trait::async_trait]
+impl FileRead for Box<dyn FileRead> {
Review Comment:
```suggestion
impl<T: AsRef<dyn FileRead>> FileRead for T {
```
##########
crates/iceberg/src/arrow/scan_metrics.rs:
##########
@@ -0,0 +1,101 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you 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.
+
+//! Scan metrics and I/O counting for Parquet data file reads.
+
+use std::ops::Range;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+use bytes::Bytes;
+
+use crate::error::Result;
+use crate::io::FileRead;
+use crate::scan::ArrowRecordBatchStream;
+
+/// Wraps a [`FileRead`] to count bytes read via a shared atomic counter.
+pub(crate) struct CountingFileRead<F: FileRead> {
+ inner: F,
+ bytes_read: Arc<AtomicU64>,
+}
+
+impl<F: FileRead> CountingFileRead<F> {
+ pub(crate) fn new(inner: F, bytes_read: Arc<AtomicU64>) -> Self {
+ Self { inner, bytes_read }
+ }
+}
+
+#[async_trait::async_trait]
+impl<F: FileRead> FileRead for CountingFileRead<F> {
+ async fn read(&self, range: Range<u64>) -> Result<Bytes> {
+ debug_assert!(range.end >= range.start);
+ self.bytes_read
+ .fetch_add(range.end - range.start, Ordering::Relaxed);
+ self.inner.read(range).await
+ }
+}
+
+/// Metrics collected during an Iceberg scan.
+#[derive(Clone, Debug)]
+pub struct ScanMetrics {
+ bytes_read: Arc<AtomicU64>,
+}
+
+impl ScanMetrics {
+ pub(crate) fn new() -> Self {
+ Self {
+ bytes_read: Arc::new(AtomicU64::new(0)),
+ }
+ }
+
+ pub(crate) fn bytes_read_counter(&self) -> &Arc<AtomicU64> {
+ &self.bytes_read
+ }
+
+ /// Total bytes read from storage for data files during this scan.
+ pub fn bytes_read(&self) -> u64 {
+ self.bytes_read.load(Ordering::Relaxed)
+ }
+}
+
+/// Result of [`ArrowReader::read`](super::ArrowReader::read), containing the
+/// record batch stream and metrics collected during the scan.
+pub struct ScanResult {
+ stream: ArrowRecordBatchStream,
+ metrics: ScanMetrics,
+}
+
+impl ScanResult {
+ pub(crate) fn new(stream: ArrowRecordBatchStream, metrics: ScanMetrics) ->
Self {
+ Self { stream, metrics }
+ }
+
+ /// Consumes the result, returning only the record batch stream.
+ pub fn stream(self) -> ArrowRecordBatchStream {
+ self.stream
+ }
+
+ /// Returns a reference to the scan metrics.
+ pub fn metrics(&self) -> &ScanMetrics {
+ &self.metrics
+ }
+
+ /// Consumes the result into its parts.
+ pub fn into_parts(self) -> (ArrowRecordBatchStream, ScanMetrics) {
Review Comment:
```suggestion
pub(crate) fn into_parts(self) -> (ArrowRecordBatchStream, ScanMetrics) {
```
##########
crates/iceberg/src/arrow/delete_file_loader.rs:
##########
@@ -39,6 +40,7 @@ pub trait DeleteFileLoader {
&self,
task: &FileScanTaskDeleteFile,
schema: SchemaRef,
+ bytes_read: &Arc<AtomicU64>,
Review Comment:
I don't think it's a good idea to pass a metrics around in trait method,
instead we should store `ScanMetrics` in concrete implementation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
