-
Notifications
You must be signed in to change notification settings - Fork 194
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
feat(puffin): Add Puffin crate and CompressionCodec #745
Merged
Merged
Changes from all commits
Commits
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# 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 = "iceberg-puffin" | ||
version = { workspace = true } | ||
edition = { workspace = true } | ||
homepage = { workspace = true } | ||
rust-version = { workspace = true } | ||
|
||
categories = ["database"] | ||
description = "Apache Iceberg Puffin" | ||
repository = { workspace = true } | ||
license = { workspace = true } | ||
keywords = ["iceberg", "puffin"] | ||
|
||
[dependencies] | ||
iceberg = { workspace = true } | ||
zstd = { workspace = true } | ||
|
||
[dev-dependencies] | ||
tokio = { workspace = true } |
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,120 @@ | ||
// 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 iceberg::{Error, ErrorKind, Result}; | ||
|
||
#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)] | ||
/// Data compression formats | ||
pub enum CompressionCodec { | ||
#[default] | ||
/// No compression | ||
None, | ||
/// LZ4 single compression frame with content size present | ||
Lz4, | ||
/// Zstandard single compression frame with content size present | ||
Zstd, | ||
} | ||
|
||
impl CompressionCodec { | ||
pub(crate) fn decompress(&self, bytes: Vec<u8>) -> Result<Vec<u8>> { | ||
match self { | ||
CompressionCodec::None => Ok(bytes), | ||
CompressionCodec::Lz4 => Err(Error::new( | ||
ErrorKind::FeatureUnsupported, | ||
"LZ4 decompression is not supported currently", | ||
)), | ||
CompressionCodec::Zstd => { | ||
let decompressed = zstd::stream::decode_all(&bytes[..])?; | ||
Ok(decompressed) | ||
} | ||
} | ||
} | ||
|
||
pub(crate) fn compress(&self, bytes: Vec<u8>) -> Result<Vec<u8>> { | ||
match self { | ||
CompressionCodec::None => Ok(bytes), | ||
CompressionCodec::Lz4 => Err(Error::new( | ||
ErrorKind::FeatureUnsupported, | ||
"LZ4 compression is not supported currently", | ||
)), | ||
CompressionCodec::Zstd => { | ||
let writer = Vec::<u8>::new(); | ||
let mut encoder = zstd::stream::Encoder::new(writer, 3)?; | ||
encoder.include_checksum(true)?; | ||
encoder.set_pledged_src_size(Some(bytes.len().try_into()?))?; | ||
std::io::copy(&mut &bytes[..], &mut encoder)?; | ||
let compressed = encoder.finish()?; | ||
Ok(compressed) | ||
} | ||
} | ||
} | ||
|
||
pub(crate) fn is_none(&self) -> bool { | ||
matches!(self, CompressionCodec::None) | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use crate::compression::CompressionCodec; | ||
|
||
#[tokio::test] | ||
async fn test_compression_codec_none() { | ||
let compression_codec = CompressionCodec::None; | ||
let bytes_vec = [0_u8; 100].to_vec(); | ||
|
||
let compressed = compression_codec.compress(bytes_vec.clone()).unwrap(); | ||
assert_eq!(bytes_vec, compressed); | ||
|
||
let decompressed = compression_codec.decompress(compressed.clone()).unwrap(); | ||
assert_eq!(compressed, decompressed) | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_compression_codec_lz4() { | ||
let compression_codec = CompressionCodec::Lz4; | ||
let bytes_vec = [0_u8; 100].to_vec(); | ||
|
||
assert_eq!( | ||
compression_codec | ||
.compress(bytes_vec.clone()) | ||
.unwrap_err() | ||
.to_string(), | ||
"FeatureUnsupported => LZ4 compression is not supported currently", | ||
); | ||
|
||
assert_eq!( | ||
compression_codec | ||
.decompress(bytes_vec.clone()) | ||
.unwrap_err() | ||
.to_string(), | ||
"FeatureUnsupported => LZ4 decompression is not supported currently", | ||
) | ||
} | ||
|
||
#[tokio::test] | ||
async fn test_compression_codec_zstd() { | ||
let compression_codec = CompressionCodec::Zstd; | ||
let bytes_vec = [0_u8; 100].to_vec(); | ||
|
||
let compressed = compression_codec.compress(bytes_vec.clone()).unwrap(); | ||
assert!(compressed.len() < bytes_vec.len()); | ||
|
||
let decompressed = compression_codec.decompress(compressed.clone()).unwrap(); | ||
assert_eq!(decompressed, bytes_vec) | ||
} | ||
} |
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,25 @@ | ||
// 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. | ||
|
||
//! Iceberg Puffin implementation. | ||
#![deny(missing_docs)] | ||
// Temporarily allowing this while crate is under active development | ||
#![allow(dead_code)] | ||
|
||
mod compression; | ||
pub use compression::CompressionCodec; |
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.
Do we really need to put this outside of iceberg crate? I'm thinking how will we deal with
PuffinReader/PuffindWriter
, which will depend on FileIO?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.
I don't understand why this would cause issues since
FileIO
is a publicly exposed interface? 🤔That said, I think you're right.
I don't see any compelling reasons to separate this functionality into a separate crate outside of the iceberg crate.
I didn't consider this option; I just forgot 😅
Here's a quick follow-up PR to move this functionality inside of the existing iceberg crate: #789