Skip to content
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 compression for IPC #1855

Closed
wants to merge 13 commits into from
5 changes: 5 additions & 0 deletions arrow/Cargo.toml
Expand Up @@ -38,6 +38,8 @@ path = "src/lib.rs"
bench = false

[dependencies]
lz4 = { version = "1.23", default-features = false, optional = true }
zstd = { version = "0.11.1", default-features = false, optional = true }
ahash = { version = "0.7", default-features = false }
serde = { version = "1.0", default-features = false }
serde_derive = { version = "1.0", default-features = false }
Expand All @@ -63,6 +65,7 @@ bitflags = { version = "1.2.1", default-features = false }

[features]
default = ["csv", "ipc", "test_utils"]
ipc_compression = ["zstd", "lz4"]
csv = ["csv_crate"]
ipc = ["flatbuffers"]
alamb marked this conversation as resolved.
Show resolved Hide resolved
simd = ["packed_simd"]
Expand All @@ -83,6 +86,8 @@ rand = { version = "0.8", default-features = false, features = ["std", "std_rng
criterion = { version = "0.3", default-features = false }
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
tempfile = { version = "3", default-features = false }
lz4 = { version = "1.23", default-features = false }
zstd = { version = "0.11", default-features = false }
Comment on lines +89 to +90
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these need to be in dev dependencies do they? If they are already in the dependencies of the crate?

Copy link
Contributor Author

@liukun4515 liukun4515 Aug 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can’t remove the lz4 and zstd from dev-dependency.
The ipc_compression is not in the default feature, we can‘t run cargo test with the lz4 and zstd lib.
But we need to run the ipc compiression UT in CI

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I try to remove these from the dev-dependency, can run cargo test.
I got the compile error.

error[E0433]: failed to resolve: use of undeclared crate or module `lz4`
  --> arrow/src/ipc/compression/ipc_compression.rs:57:39
   |
57 |                     let mut encoder = lz4::EncoderBuilder::new().build(output)?;
   |                                       ^^^ use of undeclared crate or module `lz4`

error[E0433]: failed to resolve: use of undeclared crate or module `zstd`
  --> arrow/src/ipc/compression/ipc_compression.rs:65:39
   |
65 |                     let mut encoder = zstd::Encoder::new(output, 0)?;
   |                                       ^^^^ use of undeclared crate or module `zstd`
   |
help: there is a crate or module with a similar name
   |
65 |                     let mut encoder = std::Encoder::new(output, 0)?;
   |                                       ~~~

@alamb


[build-dependencies]

Expand Down
124 changes: 124 additions & 0 deletions arrow/src/ipc/compression/ipc_compression.rs
@@ -0,0 +1,124 @@
// 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::ipc::CompressionType;

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum CompressionCodecType {
NoCompression,
Lz4Frame,
Zstd,
}

impl From<CompressionType> for CompressionCodecType {
fn from(compression_type: CompressionType) -> Self {
match compression_type {
CompressionType::ZSTD => CompressionCodecType::Zstd,
CompressionType::LZ4_FRAME => CompressionCodecType::Lz4Frame,
_ => CompressionCodecType::NoCompression,
}
}
}

impl From<CompressionCodecType> for Option<CompressionType> {
fn from(codec: CompressionCodecType) -> Self {
match codec {
CompressionCodecType::NoCompression => None,
CompressionCodecType::Lz4Frame => Some(CompressionType::LZ4_FRAME),
CompressionCodecType::Zstd => Some(CompressionType::ZSTD),
}
}
}

#[cfg(any(feature = "ipc_compression", test))]
mod compression_function {
use crate::error::Result;
use crate::ipc::compression::ipc_compression::CompressionCodecType;
use std::io::{Read, Write};

impl CompressionCodecType {
pub fn compress(&self, input: &[u8], output: &mut Vec<u8>) -> Result<()> {
match self {
CompressionCodecType::Lz4Frame => {
let mut encoder = lz4::EncoderBuilder::new().build(output).unwrap();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the doc seems to say, "This module provides access to the block mode functions of the lz4 C library".
LZ4_FRAME compression requires the frame functions of the lz4 C library. Apparently you can use https://docs.rs/lz4_flex/latest/lz4_flex/ instead.

encoder.write_all(input).unwrap();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest passing the errors back out of here directly (as compress returns a Result) rather than unwrap() which will panic on error

encoder.finish().1.unwrap();
Ok(())
}
CompressionCodecType::Zstd => {
let mut encoder = zstd::Encoder::new(output, 0).unwrap();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we pass the error out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix, and pass the error out.

encoder.write_all(input).unwrap();
encoder.finish().unwrap();
Ok(())
}
_ => Ok(()),
}
}

pub fn decompress(&self, input: &[u8], output: &mut Vec<u8>) -> Result<usize> {
let result: Result<usize> = match self {
CompressionCodecType::Lz4Frame => {
let mut decoder = lz4::Decoder::new(input)?;
match decoder.read_to_end(output) {
Ok(size) => Ok(size),
Err(e) => Err(e.into()),
}
}
CompressionCodecType::Zstd => {
let mut decoder = zstd::Decoder::new(input)?;
match decoder.read_to_end(output) {
Ok(size) => Ok(size),
Err(e) => Err(e.into()),
}
}
_ => Ok(input.len()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for CompressionCodecType::NoCompression? If so, do we need to copy form input to output?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the NoCompression in the CompressionCodecType.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just handle the LZ4 and ZSTD branch.

};
result
}
}
}

#[cfg(test)]
mod tests {
use crate::ipc::compression::ipc_compression::CompressionCodecType;

#[test]
fn test_lz4_compression() {
let input_bytes = "hello lz4".as_bytes();
let codec: CompressionCodecType = CompressionCodecType::Lz4Frame;
let mut output_bytes: Vec<u8> = Vec::new();
codec.compress(input_bytes, &mut output_bytes).unwrap();
let mut result_output_bytes: Vec<u8> = Vec::new();
codec
.decompress(output_bytes.as_slice(), &mut result_output_bytes)
.unwrap();
assert_eq!(input_bytes, result_output_bytes.as_slice());
}

#[test]
fn test_zstd_compression() {
let input_bytes = "hello zstd".as_bytes();
let codec: CompressionCodecType = CompressionCodecType::Zstd;
let mut output_bytes: Vec<u8> = Vec::new();
codec.compress(input_bytes, &mut output_bytes).unwrap();
let mut result_output_bytes: Vec<u8> = Vec::new();
codec
.decompress(output_bytes.as_slice(), &mut result_output_bytes)
.unwrap();
assert_eq!(input_bytes, result_output_bytes.as_slice());
}
}
21 changes: 21 additions & 0 deletions arrow/src/ipc/compression/mod.rs
@@ -0,0 +1,21 @@
// 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.

pub(crate) mod ipc_compression;
pub(crate) const LENGTH_EMPTY_COMPRESSED_DATA: i64 = 0;
pub(crate) const LENGTH_NO_COMPRESSED_DATA: i64 = -1;
pub(crate) const LENGTH_OF_PREFIX_DATA: i64 = 8;
2 changes: 2 additions & 0 deletions arrow/src/ipc/mod.rs
Expand Up @@ -22,6 +22,8 @@ pub mod convert;
pub mod reader;
pub mod writer;

mod compression;
alamb marked this conversation as resolved.
Show resolved Hide resolved

#[allow(clippy::redundant_closure)]
#[allow(clippy::needless_lifetimes)]
#[allow(clippy::extra_unused_lifetimes)]
Expand Down