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 with revamped feature flags #2369

Merged
merged 38 commits into from Aug 14, 2022
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e51eca3
support compression for IPC
liukun4515 Jun 13, 2022
ede5115
Merge remote-tracking branch 'origin/master' into flight_data_compres…
liukun4515 Jun 18, 2022
67e7de5
fix conflict
liukun4515 Jun 18, 2022
58488a3
edit toml
liukun4515 Jun 18, 2022
932e381
fix clippy and format
liukun4515 Jun 19, 2022
fcc4f5f
format doc
liukun4515 Jun 19, 2022
5b0d711
format code
liukun4515 Jun 19, 2022
0c61067
add padding for tail of each buffer
liukun4515 Jun 19, 2022
9ac4b01
try fix the arrow lz4 and zstd
liukun4515 Jun 19, 2022
49edfc8
add lz4,zstd for compression cfg
liukun4515 Jun 19, 2022
5d974b3
add cfg for ipm_compression
liukun4515 Jul 29, 2022
a14e1e1
Merge remote-tracking branch 'upstream/master' into flight_data_compr…
liukun4515 Jul 29, 2022
7f90fb2
address comments
liukun4515 Aug 1, 2022
4287c0f
Rework ipc_compression feature flags and plumb through errors
alamb Aug 7, 2022
45a5389
fixup flags in reader
alamb Aug 7, 2022
3bd610d
Make stub interface
alamb Aug 7, 2022
f7b1803
Compiles without ipc_compression support
alamb Aug 8, 2022
201de6e
Fix tests
alamb Aug 8, 2022
c32f6e1
Clean up writing
alamb Aug 8, 2022
0b407e8
use uniform flag syntax
alamb Aug 8, 2022
37504da
fix flags
alamb Aug 8, 2022
e2456f5
Rename for clarity
alamb Aug 8, 2022
5ab5afd
fix compilation
alamb Aug 8, 2022
e5d9747
Add ipc_compression tests to IC
alamb Aug 8, 2022
8ab3d39
fix: clippy
alamb Aug 8, 2022
3b7f94a
Merge remote-tracking branch 'apache/master' into alamb/help_feature_…
alamb Aug 8, 2022
21eb68d
merge-confligts
alamb Aug 8, 2022
443d7fb
Add note in doc
alamb Aug 8, 2022
3db3d54
Remove redundant dev dependencies
alamb Aug 13, 2022
bef901d
improve variable name
alamb Aug 13, 2022
8d1c50d
Apply suggestions from code review
alamb Aug 13, 2022
ee41c32
improve comment in stub.rs
alamb Aug 13, 2022
76a31c1
Merge remote-tracking branch 'apache/master' into alamb/help_feature_…
alamb Aug 13, 2022
c78dd22
Fix for new clippy
alamb Aug 13, 2022
c51c8cc
Clean up clippy
alamb Aug 13, 2022
2ed7ce3
Clean up header writing
alamb Aug 13, 2022
257c3b4
Merge branch 'alamb/help_feature_flags' of github.com:alamb/arrow-rs …
alamb Aug 13, 2022
4f59de4
fmt
alamb Aug 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/arrow.yml
Expand Up @@ -53,7 +53,7 @@ jobs:
cargo test -p arrow
- name: Test --features=force_validate,prettyprint,ffi
alamb marked this conversation as resolved.
Show resolved Hide resolved
run: |
cargo test -p arrow --features=force_validate,prettyprint,ffi
cargo test -p arrow --features=force_validate,prettyprint,ipc_compression,ffi
- name: Run examples
run: |
# Test arrow examples
Expand Down Expand Up @@ -172,4 +172,4 @@ jobs:
rustup component add clippy
- name: Run clippy
run: |
cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi --all-targets -- -D warnings
cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi,ipc_compression --all-targets -- -D warnings
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 @@ -64,6 +66,7 @@ bitflags = { version = "1.2.1", default-features = false }

[features]
default = ["csv", "ipc"]
ipc_compression = ["ipc", "zstd", "lz4"]
csv = ["csv_crate"]
ipc = ["flatbuffers"]
simd = ["packed_simd"]
Expand All @@ -86,6 +89,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 }
alamb marked this conversation as resolved.
Show resolved Hide resolved

[build-dependencies]

Expand Down
3 changes: 2 additions & 1 deletion arrow/README.md
Expand Up @@ -42,7 +42,8 @@ However, for historical reasons, this crate uses versions with major numbers gre
The `arrow` crate provides the following features which may be enabled in your `Cargo.toml`:

- `csv` (default) - support for reading and writing Arrow arrays to/from csv files
- `ipc` (default) - support for the [arrow-flight](https://crates.io/crates/arrow-flight) IPC and wire format
- `ipc` (default) - support for reading [Arrow IPC Format](https://arrow.apache.org/docs/format/Columnar.html#serialization-and-interprocess-communication-ipc), also used as the wire protocol in [arrow-flight](https://crates.io/crates/arrow-flight)
- `ipc_compression` - Enables reading and writing compressed IPC streams (also enables `ipc`)
- `prettyprint` - support for formatting record batches as textual columns
- `js` - support for building arrow for WebAssembly / JavaScript
- `simd` - (_Requires Nightly Rust_) Use alternate hand optimized
Expand Down
205 changes: 205 additions & 0 deletions arrow/src/ipc/compression/codec.rs
@@ -0,0 +1,205 @@
// 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::buffer::Buffer;
use crate::error::{ArrowError, Result};
use crate::ipc::CompressionType;
use std::io::{Read, Write};

const LENGTH_NO_COMPRESSED_DATA: i64 = -1;
const LENGTH_OF_PREFIX_DATA: i64 = 8;

#[derive(Debug, Clone, Copy, PartialEq)]
/// Represents compressing a ipc stream using a particular compression algorithm
pub enum CompressionCodec {
Lz4Frame,
Zstd,
}

impl TryFrom<CompressionType> for CompressionCodec {
type Error = ArrowError;

fn try_from(compression_type: CompressionType) -> Result<Self> {
match compression_type {
CompressionType::ZSTD => Ok(CompressionCodec::Zstd),
CompressionType::LZ4_FRAME => Ok(CompressionCodec::Lz4Frame),
other_type => Err(ArrowError::NotYetImplemented(format!(
"compression type {:?} not supported ",
other_type
))),
}
}
}

impl CompressionCodec {
/// Compresses the data in `input` to `output` and appends the
/// data using the specified compression mechanism.
///
/// returns the number of bytes written to the stream
///
/// Writes this format to output:
/// ```text
/// [8 bytes]: uncompressed length
/// [reminaing bytes]: compressed data stream
alamb marked this conversation as resolved.
Show resolved Hide resolved
/// ```
pub(crate) fn compress_to_vec(
&self,
input: &[u8],
output: &mut Vec<u8>,
) -> Result<usize> {
let uncompressed_data_len = input.len();
let original_output_len = output.len();

if uncompressed_data_len == 0 {
alamb marked this conversation as resolved.
Show resolved Hide resolved
// empty input, nothing to do
} else {
// write compressed data directly into the output buffer
output.extend_from_slice(&uncompressed_data_len.to_le_bytes());
self.compress(input, output)?;

let compression_len = output.len();
if compression_len > uncompressed_data_len {
// length of compressed data was larger than
// uncompressed data, use the uncompressed data with
// length -1 to indicate that we don't compress the
// data
output.truncate(original_output_len);
output.extend_from_slice(&LENGTH_NO_COMPRESSED_DATA.to_le_bytes());
output.extend_from_slice(input);
}
}
Ok(output.len() - original_output_len)
}

/// Decompresses the input into a [`Buffer`]
///
/// The input should look like:
/// ```text
/// [8 bytes]: uncompressed length
/// [reminaing bytes]: compressed data stream
alamb marked this conversation as resolved.
Show resolved Hide resolved
/// ```
pub(crate) fn decompress_to_buffer(&self, input: &[u8]) -> Result<Buffer> {
// read the first 8 bytes to determine if the data is
// compressed
let decompressed_length = read_uncompressed_size(input);
let buffer = if decompressed_length == 0 {
// emtpy
let empty = Vec::<u8>::new();
Buffer::from(empty)
} else if decompressed_length == LENGTH_NO_COMPRESSED_DATA {
// no compression
let data = &input[(LENGTH_OF_PREFIX_DATA as usize)..];
Buffer::from(data)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just an observation, but this copy is kind of unfortunate (although existed before)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you thinking the alternate is to create a Buffer initially and write this code in terms of Buffer rather than &[u8]?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah... Not important for this PR, but it seems unfortunate the amount of memory copying we are doing, especially when the major design goal of the IPC spec is to avoid this 😅

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Filed #2437

} else {
// decompress data using the codec
let mut _uncompressed_buffer =
Vec::with_capacity(decompressed_length as usize);
let input_data = &input[(LENGTH_OF_PREFIX_DATA as usize)..];
self.decompress(input_data, &mut _uncompressed_buffer)?;
Buffer::from(_uncompressed_buffer)
};
Ok(buffer)
}

/// Compress the data in input buffer and write to output buffer
/// using the specified compression
fn compress(&self, input: &[u8], output: &mut Vec<u8>) -> Result<()> {
match self {
CompressionCodec::Lz4Frame => {
let mut encoder = lz4::EncoderBuilder::new().build(output)?;
encoder.write_all(input)?;
match encoder.finish().1 {
Ok(_) => Ok(()),
Err(e) => Err(e.into()),
}
}
CompressionCodec::Zstd => {
let mut encoder = zstd::Encoder::new(output, 0)?;
encoder.write_all(input)?;
match encoder.finish() {
Ok(_) => Ok(()),
Err(e) => Err(e.into()),
}
}
}
}

/// Decompress the data in input buffer and write to output buffer
/// using the specified compression
fn decompress(&self, input: &[u8], output: &mut Vec<u8>) -> Result<usize> {
let result: Result<usize> = match self {
CompressionCodec::Lz4Frame => {
let mut decoder = lz4::Decoder::new(input)?;
match decoder.read_to_end(output) {
Ok(size) => Ok(size),
Err(e) => Err(e.into()),
}
}
CompressionCodec::Zstd => {
let mut decoder = zstd::Decoder::new(input)?;
match decoder.read_to_end(output) {
Ok(size) => Ok(size),
Err(e) => Err(e.into()),
}
}
};
result
}
}

/// Get the uncompressed length
/// Notes:
/// -1: indicate that the data that follows is not compressed
alamb marked this conversation as resolved.
Show resolved Hide resolved
/// 0: indicate that there is no data
/// positive number: indicate the uncompressed length for the following data
#[inline]
fn read_uncompressed_size(buffer: &[u8]) -> i64 {
let len_buffer = &buffer[0..8];
// 64-bit little-endian signed integer
i64::from_le_bytes(len_buffer.try_into().unwrap())
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_lz4_compression() {
let input_bytes = "hello lz4".as_bytes();
let codec: CompressionCodec = CompressionCodec::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: CompressionCodec = CompressionCodec::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());
}
}
26 changes: 26 additions & 0 deletions arrow/src/ipc/compression/mod.rs
@@ -0,0 +1,26 @@
// 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.

#[cfg(feature = "ipc_compression")]
mod codec;
#[cfg(feature = "ipc_compression")]
pub(crate) use codec::CompressionCodec;

#[cfg(not(feature = "ipc_compression"))]
mod stub;
#[cfg(not(feature = "ipc_compression"))]
pub(crate) use stub::CompressionCodec;
63 changes: 63 additions & 0 deletions arrow/src/ipc/compression/stub.rs
@@ -0,0 +1,63 @@
// 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.

//! Stubs that implement the same interface as ipc_compression
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is what gets run if the ipc_compression flag is not enabled

//! but always error.
Copy link
Member

Choose a reason for hiding this comment

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

👍


use crate::buffer::Buffer;
use crate::error::{ArrowError, Result};
use crate::ipc::CompressionType;

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum CompressionCodec {}

impl TryFrom<CompressionCodec> for CompressionType {
type Error = ArrowError;
fn try_from(codec: CompressionCodec) -> Result<Self> {
return Err(ArrowError::InvalidArgumentError(
format!("codec type {:?} not supported because arrow was not compiled with the ipc_compression feature", codec)));
}
}

impl TryFrom<CompressionType> for CompressionCodec {
type Error = ArrowError;

fn try_from(compression_type: CompressionType) -> Result<Self> {
Err(ArrowError::InvalidArgumentError(
format!("compression type {:?} not supported because arrow was not compiled with the ipc_compression feature", compression_type))
)
}
}

impl CompressionCodec {
#[allow(clippy::ptr_arg)]
Copy link
Contributor

Choose a reason for hiding this comment

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

I might be misunderstanding this lint, but I don't think it should be firing for this method

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I remove it and run clippy like

cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils --all-targets -- -D warnings

Clippy tells me:

error: writing `&mut Vec` instead of `&mut [_]` involves a new object where a slice will do
  --> arrow/src/ipc/compression/stub.rs:50:18
   |
50 |         _output: &mut Vec<u8>,
   |                  ^^^^^^^^^^^^ help: change this to: `&mut [u8]`
   |
   = note: `-D clippy::ptr-arg` implied by `-D warnings`
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#ptr_arg

Which while true in this case, is not true for the actual codec implementation, and they both need to have the same signature.

Copy link
Contributor

@tustvold tustvold Aug 13, 2022

Choose a reason for hiding this comment

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

That's a very daft lint, &mut Vec<u8> is not the same as &mut [u8], in particular the latter must initialize memory... I can understand &[u8] vs &Vec<u8> but the mutability makes a difference... I somewhat assumed clippy wasn't being silly, guess I was wrong 😅

pub(crate) fn compress_to_vec(
&self,
_input: &[u8],
_output: &mut Vec<u8>,
) -> Result<usize> {
Err(ArrowError::InvalidArgumentError(
"compression not supported because arrow was not compiled with the ipc_compression feature".to_string()
))
}

pub(crate) fn decompress_to_buffer(&self, _input: &[u8]) -> Result<Buffer> {
Err(ArrowError::InvalidArgumentError(
"decompression not supported because arrow was not compiled with the ipc_compression feature".to_string()
))
}
}
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;

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