Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ jobs:
--lib \
--tests \
--bins \
--features serde,avro,json,backtrace,integration-tests
--features serde,avro,json,backtrace,integration-tests,parquet_encryption
- name: Verify Working Directory Clean
run: git diff --exit-code

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ Default features:
- `datetime_expressions`: date and time functions such as `to_timestamp`
- `encoding_expressions`: `encode` and `decode` functions
- `parquet`: support for reading the [Apache Parquet] format
- `parquet_encryption`: support for using [Parquet Modular Encryption]
- `regex_expressions`: regular expression functions, such as `regexp_match`
- `unicode_expressions`: Include unicode aware functions such as `character_length`
- `unparser`: enables support to reverse LogicalPlans back into SQL
Expand All @@ -128,6 +127,7 @@ Optional features:

- `avro`: support for reading the [Apache Avro] format
- `backtrace`: include backtrace information in error messages
- `parquet_encryption`: support for using [Parquet Modular Encryption]
- `pyarrow`: conversions between PyArrow and DataFusion types
- `serde`: enable arrow-schema's `serde` feature

Expand Down
1 change: 1 addition & 0 deletions datafusion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ datafusion = { workspace = true, features = [
"encoding_expressions",
"nested_expressions",
"parquet",
"parquet_encryption",
"recursive_protection",
"regex_expressions",
"unicode_expressions",
Expand Down
2 changes: 1 addition & 1 deletion datafusion-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ bytes = { workspace = true }
dashmap = { workspace = true }
# note only use main datafusion crate for examples
base64 = "0.22.1"
datafusion = { workspace = true, default-features = true }
datafusion = { workspace = true, default-features = true, features = ["parquet_encryption"] }
datafusion-ffi = { workspace = true }
datafusion-physical-expr-adapter = { workspace = true }
datafusion-proto = { workspace = true }
Expand Down
4 changes: 4 additions & 0 deletions datafusion/common/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,8 @@ config_namespace! {

config_namespace! {
/// Options for configuring Parquet Modular Encryption
///
/// To use Parquet encryption, you must enable the `parquet_encryption` feature flag, as it is not activated by default.
pub struct ParquetEncryptionOptions {
/// Optional file decryption properties
pub file_decryption: Option<ConfigFileDecryptionProperties>, default = None
Expand Down Expand Up @@ -1880,6 +1882,8 @@ pub struct TableParquetOptions {
/// ```
pub key_value_metadata: HashMap<String, Option<String>>,
/// Options for configuring Parquet modular encryption
///
/// To use Parquet encryption, you must enable the `parquet_encryption` feature flag, as it is not activated by default.
/// See ConfigFileEncryptionProperties and ConfigFileDecryptionProperties in datafusion/common/src/config.rs
/// These can be set via 'format.crypto', for example:
/// ```sql
Expand Down
3 changes: 1 addition & 2 deletions datafusion/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ default = [
"unicode_expressions",
"compression",
"parquet",
"parquet_encryption",
"recursive_protection",
]
encoding_expressions = ["datafusion-functions/encoding_expressions"]
Expand All @@ -71,7 +70,7 @@ force_hash_collisions = ["datafusion-physical-plan/force_hash_collisions", "data
math_expressions = ["datafusion-functions/math_expressions"]
parquet = ["datafusion-common/parquet", "dep:parquet", "datafusion-datasource-parquet"]
parquet_encryption = [
"dep:parquet",
"parquet",
"parquet/encryption",
"datafusion-common/parquet_encryption",
"datafusion-datasource-parquet/parquet_encryption",
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sqllogictest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bigdecimal = { workspace = true }
bytes = { workspace = true, optional = true }
chrono = { workspace = true, optional = true }
clap = { version = "4.5.44", features = ["derive", "env"] }
datafusion = { workspace = true, default-features = true, features = ["avro"] }
datafusion = { workspace = true, default-features = true, features = ["avro", "parquet_encryption"] }
datafusion-spark = { workspace = true, default-features = true }
datafusion-substrait = { workspace = true, default-features = true }
futures = { workspace = true }
Expand Down