-
Notifications
You must be signed in to change notification settings - Fork 866
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support Parsing Avro File Headers #4888
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d1b0072
Add arrow-avro
tustvold 815c83f
Add HeaderDecoder
tustvold c67129c
Add schema parsing
tustvold 8da8c4a
Add BlockDecoder
tustvold 8c5f28a
Further docs
tustvold 5955882
Apply suggestions from code review
tustvold 98a9a20
Review feedback
tustvold File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,7 @@ on: | |
- arrow-ipc/** | ||
- arrow-csv/** | ||
- arrow-json/** | ||
- arrow-avro/** | ||
- parquet/** | ||
- .github/** | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# 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. | ||
|
||
[package] | ||
name = "arrow-avro" | ||
version = { workspace = true } | ||
description = "Support for parsing Avro format into the Arrow format" | ||
homepage = { workspace = true } | ||
repository = { workspace = true } | ||
authors = { workspace = true } | ||
license = { workspace = true } | ||
keywords = { workspace = true } | ||
include = { workspace = true } | ||
edition = { workspace = true } | ||
rust-version = { workspace = true } | ||
|
||
[lib] | ||
name = "arrow_avro" | ||
path = "src/lib.rs" | ||
bench = false | ||
|
||
[dependencies] | ||
arrow-array = { workspace = true } | ||
arrow-buffer = { workspace = true } | ||
arrow-cast = { workspace = true } | ||
arrow-data = { workspace = true } | ||
arrow-schema = { workspace = true } | ||
serde_json = { version = "1.0", default-features = false, features = ["std"] } | ||
serde = { version = "1.0.188", features = ["derive"] } | ||
|
||
[dev-dependencies] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// 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 serde::{Deserialize, Serialize}; | ||
|
||
/// The metadata key used for storing the JSON encoded [`CompressionCodec`] | ||
pub const CODEC_METADATA_KEY: &str = "avro.codec"; | ||
|
||
#[derive(Debug, Copy, Clone, Serialize, Deserialize)] | ||
#[serde(rename_all = "lowercase")] | ||
pub enum CompressionCodec { | ||
Null, | ||
Deflate, | ||
BZip2, | ||
Snappy, | ||
XZ, | ||
ZStandard, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// 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. | ||
|
||
//! Convert data to / from the [Apache Arrow] memory format and [Apache Avro] | ||
//! | ||
//! [Apache Arrow]: https://arrow.apache.org | ||
//! [Apache Avro]: https://avro.apache.org/ | ||
|
||
#![allow(unused)] // Temporary | ||
|
||
pub mod reader; | ||
mod schema; | ||
|
||
mod compression; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
// 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. | ||
|
||
//! Decoder for [`Block`] | ||
|
||
use crate::reader::vlq::VLQDecoder; | ||
use arrow_schema::ArrowError; | ||
|
||
/// A file data block | ||
/// | ||
/// <https://avro.apache.org/docs/1.11.1/specification/#object-container-files> | ||
#[derive(Debug, Default)] | ||
pub struct Block { | ||
/// The number of objects in this block | ||
pub count: usize, | ||
/// The serialized objects within this block | ||
pub data: Vec<u8>, | ||
/// The sync marker | ||
pub sync: [u8; 16], | ||
} | ||
|
||
/// A decoder for [`Block`] | ||
#[derive(Debug)] | ||
pub struct BlockDecoder { | ||
state: BlockDecoderState, | ||
in_progress: Block, | ||
vlq_decoder: VLQDecoder, | ||
bytes_remaining: usize, | ||
} | ||
|
||
#[derive(Debug)] | ||
enum BlockDecoderState { | ||
Count, | ||
Size, | ||
Data, | ||
Sync, | ||
Finished, | ||
} | ||
|
||
impl Default for BlockDecoder { | ||
fn default() -> Self { | ||
Self { | ||
state: BlockDecoderState::Count, | ||
in_progress: Default::default(), | ||
vlq_decoder: Default::default(), | ||
bytes_remaining: 0, | ||
} | ||
} | ||
} | ||
|
||
impl BlockDecoder { | ||
/// Parse [`Block`] from `buf`, returning the number of bytes read | ||
/// | ||
/// This method can be called multiple times with consecutive chunks of data, allowing | ||
/// integration with chunked IO systems like [`BufRead::fill_buf`] | ||
/// | ||
/// All errors should be considered fatal, and decoding aborted | ||
/// | ||
/// Once an entire [`Block`] has been decoded this method will not read any further | ||
/// input bytes, until [`Self::flush`] is called. Afterwards [`Self::decode`] | ||
/// can then be used again to read the next block, if any | ||
/// | ||
/// [`BufRead::fill_buf`]: std::io::BufRead::fill_buf | ||
pub fn decode(&mut self, mut buf: &[u8]) -> Result<usize, ArrowError> { | ||
let max_read = buf.len(); | ||
while !buf.is_empty() { | ||
match self.state { | ||
BlockDecoderState::Count => { | ||
if let Some(c) = self.vlq_decoder.long(&mut buf) { | ||
self.in_progress.count = c.try_into().map_err(|_| { | ||
ArrowError::ParseError(format!( | ||
"Block count cannot be negative, got {c}" | ||
)) | ||
})?; | ||
|
||
self.state = BlockDecoderState::Size; | ||
} | ||
} | ||
BlockDecoderState::Size => { | ||
if let Some(c) = self.vlq_decoder.long(&mut buf) { | ||
self.bytes_remaining = c.try_into().map_err(|_| { | ||
ArrowError::ParseError(format!( | ||
"Block size cannot be negative, got {c}" | ||
)) | ||
})?; | ||
|
||
self.in_progress.data.reserve(self.bytes_remaining); | ||
self.state = BlockDecoderState::Data; | ||
} | ||
} | ||
BlockDecoderState::Data => { | ||
let to_read = self.bytes_remaining.min(buf.len()); | ||
self.in_progress.data.extend_from_slice(&buf[..to_read]); | ||
buf = &buf[to_read..]; | ||
self.bytes_remaining -= to_read; | ||
if self.bytes_remaining == 0 { | ||
self.bytes_remaining = 16; | ||
self.state = BlockDecoderState::Sync; | ||
} | ||
} | ||
BlockDecoderState::Sync => { | ||
let to_decode = buf.len().min(self.bytes_remaining); | ||
let write = &mut self.in_progress.sync[16 - to_decode..]; | ||
write[..to_decode].copy_from_slice(&buf[..to_decode]); | ||
self.bytes_remaining -= to_decode; | ||
buf = &buf[to_decode..]; | ||
if self.bytes_remaining == 0 { | ||
self.state = BlockDecoderState::Finished; | ||
} | ||
} | ||
BlockDecoderState::Finished => return Ok(max_read - buf.len()), | ||
} | ||
} | ||
Ok(max_read) | ||
} | ||
|
||
/// Flush this decoder returning the parsed [`Block`] if any | ||
pub fn flush(&mut self) -> Option<Block> { | ||
match self.state { | ||
BlockDecoderState::Finished => { | ||
self.state = BlockDecoderState::Count; | ||
Some(std::mem::take(&mut self.in_progress)) | ||
} | ||
_ => None, | ||
} | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is necessary because currently nothing is public 😄