You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2022/05/28 11:30:42 UTC
[GitHub] [arrow-rs] Ted-Jiang opened a new pull request, #1762: Prepare and construct index from col metadata for skipping pages at reading
Ted-Jiang opened a new pull request, #1762:
URL: https://github.com/apache/arrow-rs/pull/1762
# Which issue does this PR close?
Closes #1761 .
# Rationale for this change
Get this info in memory then we can apply page-level filter in future.
# What changes are included in this PR?
Add an option to read page index in `parquet/src/file/serialized_reader.rs`.
# Are there any user-facing changes?
In `parquet-testing` only `data_index_bloom_encoding_stats.parquet` has one `rowgroup` with pageIndex.
I will generate test file base on `alltypes_plain.parquet` (this file not contains any pageindex) in repo `parquet-testing`, and support multi-RG in Next Pr.
```
parquet-tools column-index ./alltypes_plain.parquet
row group 0:
column index for column id:
NONE
offset index for column id:
NONE
.
.
.
column index for column timestamp_col:
NONE
offset index for column timestamp_col:
```
<!---
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!---
If there are any breaking changes to public APIs, please add the `breaking change` label.
-->
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885434888
##########
parquet/src/data_type.rs:
##########
@@ -1194,8 +1196,8 @@ make_type!(
impl FromBytes for Int96 {
type Buffer = [u8; 12];
- fn from_le_bytes(_bs: Self::Buffer) -> Self {
- unimplemented!()
+ fn from_le_bytes(bs: Self::Buffer) -> Self {
+ Self::from_ne_bytes(bs)
Review Comment:
I am not familiar with this, is this [2b5264b](https://github.com/apache/arrow-rs/pull/1762/commits/2b5264ba6898faeab88d9d42df973cc4d3c5b0ee) , how should i test this
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884837552
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
I think i use the `lengths ` approach
##########
parquet/src/file/metadata.rs:
##########
@@ -60,6 +63,21 @@ impl ParquetMetaData {
ParquetMetaData {
file_metadata,
row_groups,
+ page_indexes: None,
+ offset_indexes: None,
+ }
+ }
+
+ pub fn new_with_page_index(
+ metadata: ParquetMetaData,
+ page_indexes: Option<Vec<Arc<dyn Index>>>,
+ offset_indexes: Option<Vec<Vec<PageLocation>>>,
Review Comment:
You mean put them into one struct, is this approach can save memory? Or maybe like construct new `offsetIndex` in next Pr.
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
Review Comment:
Yes, you are right. But i haven't decide how to construct this new 'OffsetIndex'. I think it's easy to solve this in next PR with filter logical. 😊
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
Review Comment:
Nice catch!
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884135406
##########
parquet/src/file/serialized_reader.rs:
##########
@@ -955,4 +992,60 @@ mod tests {
assert_eq!(metadata.num_row_groups(), 0);
Ok(())
}
+
+ #[test]
+ // Use java parquet-tools get below pageIndex info
+ // !```
+ // parquet-tools column-index ./data_index_bloom_encoding_stats.parquet
+ // row group 0:
+ // column index for column String:
+ // Boudary order: ASCENDING
+ // page-0 :
+ // null count min max
+ // 0 Hello today
+ //
+ // offset index for column String:
+ // page-0 :
+ // offset compressed size first row index
+ // 4 152 0
+ ///```
+ //
+ fn test_page_index_reader() {
+ let test_file = get_test_file("data_index_bloom_encoding_stats.parquet");
Review Comment:
Will add more test after add file in `parquet-testing`
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885060162
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,209 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::fmt::Debug;
+
+/// The statistics in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> Option<&T> {
+ self.min.as_ref()
+ }
+ pub fn max(&self) -> Option<&T> {
+ self.max.as_ref()
+ }
+ pub fn null_count(&self) -> Option<i64> {
+ self.null_count
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Index {
+ BOOLEAN(BooleanIndex),
Review Comment:
CamelCase is generally preferred to shouty case
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,174 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteArrayIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Index>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize_column_index(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, total_length) = get_location_offset_and_total_length(chunks)?;
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_total_length(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, usize), ParquetError> {
+ let metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, 0));
+ };
+
+ let offset: u64 = if let Some(offset) = metadata.offset_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, 0));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.offset_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The offset_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths.iter().sum()))
Review Comment:
Why not just compute the length as you go, instead of collecting to a vec and then calling sum?
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,174 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteArrayIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Index>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize_column_index(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, total_length) = get_location_offset_and_total_length(chunks)?;
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_total_length(
Review Comment:
A docstring explaining the return type would be good
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
Review Comment:
Aah - should be easy enough to fix FWIW
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
In read_pages_locations you simply reuse the same cursor to continue where the previous one left off, here you instead explicitly slice the `data` buffer and feed this into `TCompactInputProtocol`. I couldn't see a particular reason why there were two different approaches to reading the same "style" of data
##########
parquet/src/file/serialized_reader.rs:
##########
@@ -189,6 +203,27 @@ impl<R: 'static + ChunkReader> SerializedFileReader<R> {
})
}
+ /// Creates file reader from a Parquet file with page Index.
+ /// Returns error if Parquet file does not exist or is corrupt.
+ pub fn new_with_page_index(chunk_reader: R) -> Result<Self> {
Review Comment:
I see you've removed the new_with_options approach, I think I would prefer you revert that and remove this additional constructor instead. With this I'm not sure how you would set ReadOptions and also enable the page index.
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884819856
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
Review Comment:
Nice find !
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884837552
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
I think i use the `lengths ` approach. Is there something i misunderstand
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885253034
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
Because in `pages_locations` it has determined length
https://github.com/apache/parquet-format/blob/master/src/main/thrift/parquet.thrift#L909-L932
but in `ColumnIndex ` it has `list<binary>` not fixed number bytes,
https://github.com/apache/parquet-format/blob/master/src/main/thrift/parquet.thrift#L938-L971
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on pull request #1762: Support reading PageIndex from parquet metadata, prepare for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1144591707
@tustvold @alamb Thanks a lot again! ❤️
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1140265096
@alamb @tustvold plz have a review
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884818315
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
Review Comment:
I found Int96 only support `from_ne_slice `
https://github.com/apache/arrow-rs/blob/90cf78c34599d4fa258886fa87a9fbb2fc47facc/parquet/src/data_type.rs#L1197-L1214
I will add more test in future PR after generate test data.
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884807284
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
+ };
+ Ok(PageIndex {
+ min,
+ max,
+ null_count,
+ })
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok(Self {
+ physical_type,
+ indexes,
+ boundary_order: index.boundary_order,
+ })
+ }
+}
+
+impl<T: ParquetValueType> Index for NativeIndex<T> {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn physical_type(&self) -> &Type {
+ &self.physical_type
+ }
+}
+
+/// An index of a column of bytes type
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ByteIndex {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<Vec<u8>>>,
+ pub boundary_order: BoundaryOrder,
+}
+
+impl ByteIndex {
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .into_iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ (Some(min), Some(max))
+ };
+ Ok(PageIndex {
+ min,
+ max,
+ null_count,
+ })
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok(Self {
+ physical_type,
+ indexes,
+ boundary_order: index.boundary_order,
+ })
+ }
+}
+
+impl Index for ByteIndex {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn physical_type(&self) -> &Type {
+ &self.physical_type
+ }
+}
+
+/// An index of a column of boolean physical type
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct BooleanIndex {
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<bool>>,
+ pub boundary_order: BoundaryOrder,
+}
+
+impl BooleanIndex {
+ pub(crate) fn try_new(index: ColumnIndex) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .into_iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min[0] == 1;
Review Comment:
Got it.
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885239465
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,209 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::fmt::Debug;
+
+/// The statistics in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> Option<&T> {
+ self.min.as_ref()
+ }
+ pub fn max(&self) -> Option<&T> {
+ self.max.as_ref()
+ }
+ pub fn null_count(&self) -> Option<i64> {
+ self.null_count
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Index {
+ BOOLEAN(BooleanIndex),
Review Comment:
I think it should align with `Type`https://github.com/apache/arrow-rs/blob/90cf78c34599d4fa258886fa87a9fbb2fc47facc/parquet/src/basic.rs#L45-L53
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold merged pull request #1762: Support reading PageIndex from parquet metadata, prepare for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold merged PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884628312
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
Review Comment:
Given the relatively low number of physical types within parquet, and the fact this is highly unlikely to change any time soon, I think it might be cleaner to use a structured enum here instead of a trait object.
i.e. something like
```
enum Index {
Bool(BooleanIndex),
Int32(NativeIndex<i64>),
FixedLenByteArray(ByteArrayIndex)
...
}
```
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
Review Comment:
```suggestion
/// The statistics in one page
```
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = metadata.offset_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.offset_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The offset_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn deserialize(data: &[u8], column_type: Type) -> Result<Arc<dyn Index>, ParquetError> {
Review Comment:
```suggestion
fn deserialize_column_index(data: &[u8], column_type: Type) -> Result<Arc<dyn Index>, ParquetError> {
```
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
Review Comment:
Much like `OffsetIndex` below I wonder if we want some encapsulating type instead of `Vec<Arc<dyn Index>>`
##########
parquet/src/file/metadata.rs:
##########
@@ -60,6 +63,21 @@ impl ParquetMetaData {
ParquetMetaData {
file_metadata,
row_groups,
+ page_indexes: None,
+ offset_indexes: None,
+ }
+ }
+
+ pub fn new_with_page_index(
+ metadata: ParquetMetaData,
+ page_indexes: Option<Vec<Arc<dyn Index>>>,
+ offset_indexes: Option<Vec<Vec<PageLocation>>>,
Review Comment:
If memory serves, one can't exist without the other, so perhaps a single aggregating `Index` or something to group them together? This might then provide a location for the predicate evaluation logic?
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
read_pages_locations uses a cursor instead of the lengths, is there a reason for the different approaches?
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
Review Comment:
As far as I can see nothing uses the individual lengths, perhaps this could just return the offset and total length?
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
+ };
+ Ok(PageIndex {
+ min,
+ max,
+ null_count,
+ })
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok(Self {
+ physical_type,
+ indexes,
+ boundary_order: index.boundary_order,
+ })
+ }
+}
+
+impl<T: ParquetValueType> Index for NativeIndex<T> {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn physical_type(&self) -> &Type {
+ &self.physical_type
+ }
+}
+
+/// An index of a column of bytes type
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ByteIndex {
Review Comment:
```suggestion
pub struct ByteArrayIndex {
```
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
Review Comment:
I can't find any documentation on what the endianess is supposed to be, but I suspect little endian. Using native endian feels off?
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = metadata.offset_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.offset_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The offset_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn deserialize(data: &[u8], column_type: Type) -> Result<Arc<dyn Index>, ParquetError> {
+ let mut d = Cursor::new(data);
+ let mut prot = TCompactInputProtocol::new(&mut d);
+
+ let index = ColumnIndex::read_from_in_protocol(&mut prot)?;
+
+ let index = match column_type {
Review Comment:
As mentioned above a concrete `Index` enumeration would provide an obvious place to put this "constructor" logic
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
+ };
+ Ok(PageIndex {
+ min,
+ max,
+ null_count,
+ })
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok(Self {
+ physical_type,
+ indexes,
+ boundary_order: index.boundary_order,
+ })
+ }
+}
+
+impl<T: ParquetValueType> Index for NativeIndex<T> {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn physical_type(&self) -> &Type {
+ &self.physical_type
+ }
+}
+
+/// An index of a column of bytes type
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ByteIndex {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<Vec<u8>>>,
+ pub boundary_order: BoundaryOrder,
+}
+
+impl ByteIndex {
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .into_iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ (Some(min), Some(max))
+ };
+ Ok(PageIndex {
+ min,
+ max,
+ null_count,
+ })
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok(Self {
+ physical_type,
+ indexes,
+ boundary_order: index.boundary_order,
+ })
+ }
+}
+
+impl Index for ByteIndex {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+
+ fn physical_type(&self) -> &Type {
+ &self.physical_type
+ }
+}
+
+/// An index of a column of boolean physical type
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct BooleanIndex {
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<bool>>,
+ pub boundary_order: BoundaryOrder,
+}
+
+impl BooleanIndex {
+ pub(crate) fn try_new(index: ColumnIndex) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .into_iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min[0] == 1;
Review Comment:
```suggestion
let min = min[0] != 0;
```
? I can't see any particular docs, but this is the more "normal" way to convert integers to booleans.
##########
parquet/src/file/metadata.rs:
##########
@@ -83,6 +101,16 @@ impl ParquetMetaData {
pub fn row_groups(&self) -> &[RowGroupMetaData] {
&self.row_groups
}
+
+ /// Returns page indexes in this file.
+ pub fn page_indexes(&self) -> &Option<Vec<Arc<dyn Index>>> {
Review Comment:
```suggestion
pub fn page_indexes(&self) -> Option<&Vec<Arc<dyn Index>>> {
```
##########
parquet/src/file/serialized_reader.rs:
##########
@@ -189,6 +203,27 @@ impl<R: 'static + ChunkReader> SerializedFileReader<R> {
})
}
+ /// Creates file reader from a Parquet file with page Index.
+ /// Returns error if Parquet file does not exist or is corrupt.
+ pub fn new_with_page_index(chunk_reader: R) -> Result<Self> {
Review Comment:
Why do we have this new constructor, and then also the option added to `ReadOptions`. Why not just add this functionality to `new_with_options`?
##########
parquet/src/file/metadata.rs:
##########
@@ -83,6 +101,16 @@ impl ParquetMetaData {
pub fn row_groups(&self) -> &[RowGroupMetaData] {
&self.row_groups
}
+
+ /// Returns page indexes in this file.
+ pub fn page_indexes(&self) -> &Option<Vec<Arc<dyn Index>>> {
+ &self.page_indexes
+ }
+
+ /// Returns offset indexes in this file.
+ pub fn offset_indexes(&self) -> &Option<Vec<Vec<PageLocation>>> {
Review Comment:
```suggestion
pub fn offset_indexes(&self) -> Option<&Vec<Vec<PageLocation>>> {
```
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
Review Comment:
I wonder if instead of `Vec<Vec<PageLocation>>` we want some sort of `OffsetIndex` type, it isn't immediately obvious how to interpret this data and I think it would be good to encapsulate that somehow
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884819856
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
+ let data = lengths.into_iter().map(|length| {
+ let r = &data[start..start + length];
+ start += length;
+ r
+ });
+
+ chunks
+ .iter()
+ .zip(data)
+ .map(|(chunk, data)| {
+ let column_type = chunk.column_type();
+ deserialize(data, column_type)
+ })
+ .collect()
+}
+
+/// Read on row group's all indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_pages_locations<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Vec<PageLocation>>, ParquetError> {
+ let (offset, lengths) = get_location_offset_and_lengths(chunks)?;
+ let total_length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; total_length];
+ reader.read_exact(&mut data)?;
+
+ let mut d = Cursor::new(data);
+ let mut result = vec![];
+
+ for _ in 0..chunks.len() {
+ let mut prot = TCompactInputProtocol::new(&mut d);
+ let offset = OffsetIndex::read_from_in_protocol(&mut prot)?;
+ result.push(offset.page_locations);
+ }
+ Ok(result)
+}
+
+fn get_index_offset_and_lengths(
+ chunks: &[ColumnChunkMetaData],
+) -> Result<(u64, Vec<usize>), ParquetError> {
+ let first_col_metadata = if let Some(chunk) = chunks.first() {
+ chunk
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let offset: u64 = if let Some(offset) = first_col_metadata.column_index_offset() {
+ offset.try_into().unwrap()
+ } else {
+ return Ok((0, vec![]));
+ };
+
+ let lengths = chunks
+ .iter()
+ .map(|x| x.column_index_length())
+ .map(|maybe_length| {
+ let index_length = maybe_length.ok_or_else(|| {
+ ParquetError::General(
+ "The column_index_length must exist if offset_index_offset exists"
+ .to_string(),
+ )
+ })?;
+
+ Ok(index_length.try_into().unwrap())
+ })
+ .collect::<Result<Vec<_>, ParquetError>>()?;
+
+ Ok((offset, lengths))
+}
+
+fn get_location_offset_and_lengths(
Review Comment:
Nice find !
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884664015
##########
parquet/src/file/metadata.rs:
##########
@@ -60,6 +63,21 @@ impl ParquetMetaData {
ParquetMetaData {
file_metadata,
row_groups,
+ page_indexes: None,
+ offset_indexes: None,
+ }
+ }
+
+ pub fn new_with_page_index(
+ metadata: ParquetMetaData,
+ page_indexes: Option<Vec<Arc<dyn Index>>>,
+ offset_indexes: Option<Vec<Vec<PageLocation>>>,
Review Comment:
If memory serves, one can't exist without the other, so perhaps a single aggregating `FileIndex` or something to group them together? This might then provide a location for the predicate evaluation logic?
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885341514
##########
parquet/src/data_type.rs:
##########
@@ -1194,8 +1196,8 @@ make_type!(
impl FromBytes for Int96 {
type Buffer = [u8; 12];
- fn from_le_bytes(_bs: Self::Buffer) -> Self {
- unimplemented!()
+ fn from_le_bytes(bs: Self::Buffer) -> Self {
+ Self::from_ne_bytes(bs)
Review Comment:
This will be incorrect on any platform that isn't little endian...
##########
parquet/src/data_type.rs:
##########
@@ -591,6 +591,8 @@ pub(crate) mod private {
+ super::SliceAsBytes
+ PartialOrd
+ Send
+ + Sync
Review Comment:
I can't see why this change was made, it's fine, but it seems unnecessary
##########
parquet/src/file/page_index/index_reader.rs:
##########
@@ -0,0 +1,169 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::file::metadata::ColumnChunkMetaData;
+use crate::file::page_index::index::{BooleanIndex, ByteIndex, Index, NativeIndex};
+use crate::file::reader::ChunkReader;
+use parquet_format::{ColumnIndex, OffsetIndex, PageLocation};
+use std::io::{Cursor, Read};
+use std::sync::Arc;
+use thrift::protocol::TCompactInputProtocol;
+
+/// Read on row group's all columns indexes and change into [`Index`]
+/// If not the format not available return an empty vector.
+pub fn read_columns_indexes<R: ChunkReader>(
+ reader: &R,
+ chunks: &[ColumnChunkMetaData],
+) -> Result<Vec<Arc<dyn Index>>, ParquetError> {
+ let (offset, lengths) = get_index_offset_and_lengths(chunks)?;
+ let length = lengths.iter().sum::<usize>();
+
+ //read all need data into buffer
+ let mut reader = reader.get_read(offset, reader.len() as usize)?;
+ let mut data = vec![0; length];
+ reader.read_exact(&mut data)?;
+
+ let mut start = 0;
Review Comment:
But surely the thrift decoder will only read what it needs, i.e. regardless of the variable length nature of the messages it will only read the corresponding bytes? It's not a big deal, I just think we should consistently either rely on the data to be "self-delimiting" or use the lengths to decode slices
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,209 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::fmt::Debug;
+
+/// The statistics in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> Option<&T> {
+ self.min.as_ref()
+ }
+ pub fn max(&self) -> Option<&T> {
+ self.max.as_ref()
+ }
+ pub fn null_count(&self) -> Option<i64> {
+ self.null_count
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Index {
+ BOOLEAN(BooleanIndex),
Review Comment:
Fair, I mean to change that but it has been low on my priority list 😅
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885062214
##########
parquet/src/file/metadata.rs:
##########
@@ -60,6 +63,21 @@ impl ParquetMetaData {
ParquetMetaData {
file_metadata,
row_groups,
+ page_indexes: None,
+ offset_indexes: None,
+ }
+ }
+
+ pub fn new_with_page_index(
+ metadata: ParquetMetaData,
+ page_indexes: Option<Vec<Arc<dyn Index>>>,
+ offset_indexes: Option<Vec<Vec<PageLocation>>>,
Review Comment:
> Or maybe like construct new offsetIndex in next Pr.
Precisely this, they're interconnected data structures which imo make sense to encapsulate together, happy for this to left for a subsequent PR
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884847303
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
Review Comment:
Sounds reasonable! I refer the `array` code to construct this. I will try to use `enum` to solve this situation.
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] alamb commented on pull request #1762: Support reading PageIndex from parquet metadata, prepare for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
alamb commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1142623581
🎉
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885062214
##########
parquet/src/file/metadata.rs:
##########
@@ -60,6 +63,21 @@ impl ParquetMetaData {
ParquetMetaData {
file_metadata,
row_groups,
+ page_indexes: None,
+ offset_indexes: None,
+ }
+ }
+
+ pub fn new_with_page_index(
+ metadata: ParquetMetaData,
+ page_indexes: Option<Vec<Arc<dyn Index>>>,
+ offset_indexes: Option<Vec<Vec<PageLocation>>>,
Review Comment:
> Or maybe like construct new offsetIndex in next Pr.
Precisely this, they're interconnected data structures which imo make sense to encapsulate together
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885420013
##########
parquet/src/data_type.rs:
##########
@@ -591,6 +591,8 @@ pub(crate) mod private {
+ super::SliceAsBytes
+ PartialOrd
+ Send
+ + Sync
Review Comment:
😂forget clean this when change to enum
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1141944162
I intend to merge this once CI clears
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] codecov-commenter commented on pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1140246617
# [Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#1762](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (3468a21) into [master](https://codecov.io/gh/apache/arrow-rs/commit/722fcfcf2f55672c2bae626e3f652a3a792dff13?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (722fcfc) will **increase** coverage by `0.07%`.
> The diff coverage is `51.91%`.
```diff
@@ Coverage Diff @@
## master #1762 +/- ##
==========================================
+ Coverage 83.27% 83.35% +0.07%
==========================================
Files 195 198 +3
Lines 55896 56156 +260
==========================================
+ Hits 46549 46808 +259
- Misses 9347 9348 +1
```
| [Impacted Files](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [parquet/src/basic.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvYmFzaWMucnM=) | `91.49% <ø> (ø)` | |
| [parquet/src/data\_type.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZGF0YV90eXBlLnJz) | `75.84% <ø> (ø)` | |
| [parquet/src/file/page\_index/index.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZmlsZS9wYWdlX2luZGV4L2luZGV4LnJz) | `16.96% <16.96%> (ø)` | |
| [parquet/src/file/page\_index/index\_reader.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZmlsZS9wYWdlX2luZGV4L2luZGV4X3JlYWRlci5ycw==) | `79.16% <79.16%> (ø)` | |
| [parquet/src/file/serialized\_reader.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZmlsZS9zZXJpYWxpemVkX3JlYWRlci5ycw==) | `94.98% <88.63%> (-0.67%)` | :arrow_down: |
| [parquet/src/file/metadata.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZmlsZS9tZXRhZGF0YS5ycw==) | `95.15% <100.00%> (+0.72%)` | :arrow_up: |
| [arrow/src/array/array\_struct.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2FycmF5L2FycmF5X3N0cnVjdC5ycw==) | `88.40% <0.00%> (-0.05%)` | :arrow_down: |
| [...arquet/src/arrow/array\_reader/dictionary\_buffer.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvYXJyb3cvYXJyYXlfcmVhZGVyL2RpY3Rpb25hcnlfYnVmZmVyLnJz) | `94.44% <0.00%> (-0.04%)` | :arrow_down: |
| [parquet/src/arrow/array\_reader/offset\_buffer.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvYXJyb3cvYXJyYXlfcmVhZGVyL29mZnNldF9idWZmZXIucnM=) | `94.79% <0.00%> (-0.03%)` | :arrow_down: |
| [arrow/src/array/array\_binary.rs](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2FycmF5L2FycmF5X2JpbmFyeS5ycw==) | `93.27% <0.00%> (-0.03%)` | :arrow_down: |
| ... and [14 more](https://codecov.io/gh/apache/arrow-rs/pull/1762/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [2ba1ef4...3468a21](https://codecov.io/gh/apache/arrow-rs/pull/1762?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r884939750
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
Review Comment:
@tustvold Thanks for your kindly review 😊 have changed in [0f3b241](https://github.com/apache/arrow-rs/pull/1762/commits/0f3b241eaa66af51f2c998e5a917594d673cf5b5).
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885459663
##########
parquet/src/data_type.rs:
##########
@@ -1194,8 +1196,8 @@ make_type!(
impl FromBytes for Int96 {
type Buffer = [u8; 12];
- fn from_le_bytes(_bs: Self::Buffer) -> Self {
- unimplemented!()
+ fn from_le_bytes(bs: Self::Buffer) -> Self {
+ Self::from_ne_bytes(bs)
Review Comment:
It looks correct to me, it is a bit funky because Int96 is internally represented as a [u32; 3] with the least significant u32 first (i.e. little endian).
So on a big endian machine, you need to decode to big endian u32, which are then stored in a little endian array :exploding_head:
In practice Int96 is deprecated, and I'm not sure there are any big endian platforms supported by this crate, but good to be thorough :+1:.
> how should i test this
It should be covered by the existing tests, I'll create a ticket for clarifying how this is being handled crate-wide
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
tustvold commented on PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#issuecomment-1140400959
Awesome, will review tomorrow 😀
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #1762: Prepare and construct index from col metadata for skipping pages at reading
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #1762:
URL: https://github.com/apache/arrow-rs/pull/1762#discussion_r885269863
##########
parquet/src/file/page_index/index.rs:
##########
@@ -0,0 +1,284 @@
+// 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.
+
+use crate::basic::Type;
+use crate::data_type::private::ParquetValueType;
+use crate::data_type::Int96;
+use crate::errors::ParquetError;
+use crate::util::bit_util::from_ne_slice;
+use parquet_format::{BoundaryOrder, ColumnIndex};
+use std::any::Any;
+use std::fmt::Debug;
+
+/// The static in one page
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct PageIndex<T> {
+ /// The minimum value, It is None when all values are null
+ pub min: Option<T>,
+ /// The maximum value, It is None when all values are null
+ pub max: Option<T>,
+ /// Null values in the page
+ pub null_count: Option<i64>,
+}
+
+impl<T> PageIndex<T> {
+ pub fn min(&self) -> &Option<T> {
+ &self.min
+ }
+ pub fn max(&self) -> &Option<T> {
+ &self.max
+ }
+ pub fn null_count(&self) -> &Option<i64> {
+ &self.null_count
+ }
+}
+
+/// Trait object representing a [`ColumnIndex`]
+pub trait Index: Send + Sync + Debug {
+ fn as_any(&self) -> &dyn Any;
+
+ fn physical_type(&self) -> &Type;
+}
+
+impl PartialEq for dyn Index + '_ {
+ fn eq(&self, that: &dyn Index) -> bool {
+ equal(self, that)
+ }
+}
+
+impl Eq for dyn Index + '_ {}
+
+fn equal(lhs: &dyn Index, rhs: &dyn Index) -> bool {
+ if lhs.physical_type() != rhs.physical_type() {
+ return false;
+ }
+
+ match lhs.physical_type() {
+ Type::BOOLEAN => {
+ lhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<BooleanIndex>().unwrap()
+ }
+ Type::INT32 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i32>>().unwrap()
+ }
+ Type::INT64 => {
+ lhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<i64>>().unwrap()
+ }
+ Type::INT96 => {
+ lhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<Int96>>().unwrap()
+ }
+ Type::FLOAT => {
+ lhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f32>>().unwrap()
+ }
+ Type::DOUBLE => {
+ lhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ == rhs.as_any().downcast_ref::<NativeIndex<f64>>().unwrap()
+ }
+ Type::BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ Type::FIXED_LEN_BYTE_ARRAY => {
+ lhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ == rhs.as_any().downcast_ref::<ByteIndex>().unwrap()
+ }
+ }
+}
+
+/// An index of a column of [`Type`] physical representation
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NativeIndex<T: ParquetValueType> {
+ /// The physical type
+ pub physical_type: Type,
+ /// The indexes, one item per page
+ pub indexes: Vec<PageIndex<T>>,
+ /// the order
+ pub boundary_order: BoundaryOrder,
+}
+
+impl<T: ParquetValueType> NativeIndex<T> {
+ /// Creates a new [`NativeIndex`]
+ pub(crate) fn try_new(
+ index: ColumnIndex,
+ physical_type: Type,
+ ) -> Result<Self, ParquetError> {
+ let len = index.min_values.len();
+
+ let null_counts = index
+ .null_counts
+ .map(|x| x.into_iter().map(Some).collect::<Vec<_>>())
+ .unwrap_or_else(|| vec![None; len]);
+
+ let indexes = index
+ .min_values
+ .iter()
+ .zip(index.max_values.into_iter())
+ .zip(index.null_pages.into_iter())
+ .zip(null_counts.into_iter())
+ .map(|(((min, max), is_null), null_count)| {
+ let (min, max) = if is_null {
+ (None, None)
+ } else {
+ let min = min.as_slice();
+ let max = max.as_slice();
+ (Some(from_ne_slice::<T>(min)), Some(from_ne_slice::<T>(max)))
Review Comment:
Thanks fix in [d8bd4ce](https://github.com/apache/arrow-rs/pull/1762/commits/d8bd4ce2799f7f414d6404c97d3c6d350496d280).
Could you where should i get the info should use `from_le_bytes`?
Is it all java app should use `little_endian` for deserialize.
--
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: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org