add test for filter offset index and fix conflict

apache · Jul 1, 2022 · c0bc361 · c0bc361
1 parent 0992066
commit c0bc361
Show file tree

Hide file tree

Showing 10 changed files with 300 additions and 149 deletions.
diff --git a/parquet/src/arrow/array_reader/builder.rs b/parquet/src/arrow/array_reader/builder.rs
@@ -39,7 +39,7 @@ use crate::data_type::{
     Int96Type,
 };
 use crate::errors::Result;
-use crate::file::filer_offset_index::FilterOffsetIndex;
+use crate::file::page_index::filer_offset_index::FilterOffsetIndex;
 use crate::schema::types::{ColumnDescriptor, ColumnPath, SchemaDescPtr, Type};
 
 /// Create array reader from parquet schema, projection mask, and parquet file reader.

diff --git a/parquet/src/arrow/array_reader/mod.rs b/parquet/src/arrow/array_reader/mod.rs
@@ -44,7 +44,7 @@ mod struct_array;
 #[cfg(test)]
 mod test_util;
 
-use crate::file::filer_offset_index::FilterOffsetIndex;
+use crate::file::page_index::filer_offset_index::FilterOffsetIndex;
 pub use builder::build_array_reader;
 pub use byte_array::make_byte_array_reader;
 pub use byte_array_dictionary::make_byte_array_dictionary_reader;

diff --git a/parquet/src/arrow/arrow_reader.rs b/parquet/src/arrow/arrow_reader.rs
@@ -30,8 +30,8 @@ use crate::arrow::schema::parquet_to_arrow_schema;
 use crate::arrow::schema::parquet_to_arrow_schema_by_columns;
 use crate::arrow::ProjectionMask;
 use crate::errors::{ParquetError, Result};
-use crate::file::filer_offset_index::FilterOffsetIndex;
 use crate::file::metadata::{KeyValue, ParquetMetaData};
+use crate::file::page_index::filer_offset_index::FilterOffsetIndex;
 use crate::file::page_index::range::RowRanges;
 use crate::file::reader::{ChunkReader, FileReader, SerializedFileReader};
 use crate::schema::types::SchemaDescriptor;

diff --git a/parquet/src/arrow/async_reader.rs b/parquet/src/arrow/async_reader.rs
@@ -100,9 +100,9 @@ use crate::basic::Compression;
 use crate::column::page::{Page, PageIterator, PageReader};
 use crate::compression::{create_codec, Codec};
 use crate::errors::{ParquetError, Result};
-use crate::file::filer_offset_index::FilterOffsetIndex;
 use crate::file::footer::{decode_footer, decode_metadata};
 use crate::file::metadata::ParquetMetaData;
+use crate::file::page_index::filer_offset_index::FilterOffsetIndex;
 use crate::file::serialized_reader::{decode_page, read_page_header};
 use crate::file::FOOTER_SIZE;
 use crate::schema::types::{ColumnDescPtr, SchemaDescPtr, SchemaDescriptor};

diff --git a/parquet/src/file/filer_offset_index.rs b/parquet/src/file/filer_offset_index.rs
diff --git a/parquet/src/file/mod.rs b/parquet/src/file/mod.rs
@@ -95,7 +95,6 @@
 //!     println!("{}", row);
 //! }
 //! ```
-pub(crate) mod filer_offset_index;
 pub mod footer;
 pub mod metadata;
 pub mod page_encoding_stats;