Skip to content

Support Zstd compressed files #5397

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.

Sign up for GitHub

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

Merged
alamb merged 7 commits into from
Feb 27, 2023
Merged

Support Zstd compressed files #5397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05fe01f
Zstd compression
dennybritz Feb 25, 2023
312fa10
Merge branch 'main' into db/zstd-compression
dennybritz Feb 25, 2023
fa68335
datafusion-cli Cargo.lock
dennybritz Feb 25, 2023
7e3d01d
Update datafusion/core/src/datasource/file_format/file_type.rs
dennybritz Feb 25, 2023
0ce01cc
Update datafusion/core/src/datasource/file_format/file_type.rs
dennybritz Feb 25, 2023
8b680af
Update datafusion/core/src/datasource/file_format/file_type.rs
dennybritz Feb 25, 2023
b164226
Merge branch 'main' into db/zstd-compression
dennybritz Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions datafusion-cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions datafusion/common/src/parsers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ pub enum CompressionTypeVariant {
BZIP2,
/// Xz-ed file (liblzma)
XZ,
/// Zstd-ed file,
ZSTD,
/// Uncompressed file
UNCOMPRESSED,
}
Expand All @@ -47,6 +49,7 @@ impl FromStr for CompressionTypeVariant {
"GZIP" | "GZ" => Ok(Self::GZIP),
"BZIP2" | "BZ2" => Ok(Self::BZIP2),
"XZ" => Ok(Self::XZ),
"ZST" | "ZSTD" => Ok(Self::ZSTD),
"" => Ok(Self::UNCOMPRESSED),
_ => Err(ParserError::ParserError(format!(
"Unsupported file compression type {s}"
Expand All @@ -61,6 +64,7 @@ impl ToString for CompressionTypeVariant {
Self::GZIP => "GZIP",
Self::BZIP2 => "BZIP2",
Self::XZ => "XZ",
Self::ZSTD => "ZSTD",
Self::UNCOMPRESSED => "",
}
.to_string()
Expand Down
5 changes: 3 additions & 2 deletions datafusion/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ path = "src/lib.rs"
[features]
# Used to enable the avro format
avro = ["apache-avro", "num-traits", "datafusion-common/avro"]
compression = ["xz2", "bzip2", "flate2", "async-compression"]
compression = ["xz2", "bzip2", "flate2", "zstd", "async-compression"]
crypto_expressions = ["datafusion-physical-expr/crypto_expressions"]
default = ["crypto_expressions", "regex_expressions", "unicode_expressions", "compression"]
# Enables support for non-scalar, binary operations on dictionaries
Expand All @@ -61,7 +61,7 @@ unicode_expressions = ["datafusion-physical-expr/regex_expressions", "datafusion
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
apache-avro = { version = "0.14", optional = true }
arrow = { version = "33.0.0", features = ["prettyprint"] }
async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "xz", "futures-io", "tokio"], optional = true }
async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "xz", "zstd", "futures-io", "tokio"], optional = true }
async-trait = "0.1.41"
bytes = "1.1"
bzip2 = { version = "0.4.3", optional = true }
Expand Down Expand Up @@ -101,6 +101,7 @@ tokio-util = { version = "0.7.4", features = ["io"] }
url = "2.2"
uuid = { version = "1.0", features = ["v4"] }
xz2 = { version = "0.1", optional = true }
zstd = { version = "0.11", optional = true, default-features = false }


[dev-dependencies]
Expand Down
Loading