From 38b438429e36847d95fe967784531504a99ac000 Mon Sep 17 00:00:00 2001 From: Ed Seidl Date: Wed, 25 Sep 2024 22:41:24 -0700 Subject: [PATCH 1/2] silence compiler warnings --- parquet/src/file/metadata/reader.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parquet/src/file/metadata/reader.rs b/parquet/src/file/metadata/reader.rs index 4a5a1bc93c4f..9431a49b1dca 100644 --- a/parquet/src/file/metadata/reader.rs +++ b/parquet/src/file/metadata/reader.rs @@ -642,10 +642,13 @@ mod tests { use futures::future::BoxFuture; #[cfg(feature = "async")] use futures::FutureExt; + #[cfg(feature = "async")] use std::fs::File; #[cfg(feature = "async")] use std::future::Future; + #[cfg(feature = "async")] use std::io::{Read, Seek, SeekFrom}; + #[cfg(feature = "async")] use std::sync::atomic::{AtomicUsize, Ordering}; use crate::basic::SortOrder; From 6999a22a6bddf9fbc50b3206593caa1ed8432879 Mon Sep 17 00:00:00 2001 From: Ed Seidl Date: Thu, 26 Sep 2024 09:31:50 -0700 Subject: [PATCH 2/2] add async_tests module --- parquet/src/file/metadata/reader.rs | 35 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/parquet/src/file/metadata/reader.rs b/parquet/src/file/metadata/reader.rs index 9431a49b1dca..9e00c6860434 100644 --- a/parquet/src/file/metadata/reader.rs +++ b/parquet/src/file/metadata/reader.rs @@ -638,18 +638,6 @@ impl ParquetMetaDataReader { mod tests { use super::*; use bytes::Bytes; - #[cfg(feature = "async")] - use futures::future::BoxFuture; - #[cfg(feature = "async")] - use futures::FutureExt; - #[cfg(feature = "async")] - use std::fs::File; - #[cfg(feature = "async")] - use std::future::Future; - #[cfg(feature = "async")] - use std::io::{Read, Seek, SeekFrom}; - #[cfg(feature = "async")] - use std::sync::atomic::{AtomicUsize, Ordering}; use crate::basic::SortOrder; use crate::basic::Type; @@ -827,11 +815,27 @@ mod tests { "EOF: Parquet file too small. Size is 1728 but need 1729" ); } +} + +#[cfg(feature = "async")] +#[cfg(test)] +mod async_tests { + use super::*; + use bytes::Bytes; + use futures::future::BoxFuture; + use futures::FutureExt; + use std::fs::File; + use std::future::Future; + use std::io::{Read, Seek, SeekFrom}; + use std::ops::Range; + use std::sync::atomic::{AtomicUsize, Ordering}; + + use crate::arrow::async_reader::MetadataFetch; + use crate::file::reader::Length; + use crate::util::test_common::file_util::get_test_file; - #[cfg(feature = "async")] struct MetadataFetchFn(F); - #[cfg(feature = "async")] impl MetadataFetch for MetadataFetchFn where F: FnMut(Range) -> Fut + Send, @@ -842,7 +846,6 @@ mod tests { } } - #[cfg(feature = "async")] fn read_range(file: &mut File, range: Range) -> Result { file.seek(SeekFrom::Start(range.start as _))?; let len = range.end - range.start; @@ -851,7 +854,6 @@ mod tests { Ok(buf.into()) } - #[cfg(feature = "async")] #[tokio::test] async fn test_simple() { let mut file = get_test_file("nulls.snappy.parquet"); @@ -937,7 +939,6 @@ mod tests { assert_eq!(err, "Parquet error: Invalid Parquet file. Corrupt footer"); } - #[cfg(feature = "async")] #[tokio::test] async fn test_page_index() { let mut file = get_test_file("alltypes_tiny_pages.parquet");