Skip to content

Commit 823c07d

Browse files
committed
fix
1 parent 6045c77 commit 823c07d

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/audit.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,27 @@ concurrency:
2323

2424
on:
2525
push:
26+
branches:
27+
- main
2628
paths:
2729
- "**/Cargo.toml"
2830
- "**/Cargo.lock"
29-
branches:
30-
- main
3131

3232
pull_request:
3333
paths:
3434
- "**/Cargo.toml"
3535
- "**/Cargo.lock"
3636

37+
merge_group:
38+
3739
jobs:
3840
security_audit:
3941
runs-on: ubuntu-latest
4042
steps:
41-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
43+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4244
- name: Install cargo-audit
43-
run: cargo install cargo-audit
45+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
46+
with:
47+
tool: cargo-audit
4448
- name: Run audit check
45-
# Ignored until https://github.com/apache/datafusion/issues/15571
46-
# ignored py03 warning until arrow 55 upgrade
47-
run: cargo audit --ignore RUSTSEC-2024-0370 --ignore RUSTSEC-2025-0020 --ignore RUSTSEC-2025-0047
49+
run: cargo audit --ignore RUSTSEC-2025-0111

datafusion/datasource-parquet/src/opener.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ pub(super) struct ParquetOpener {
9898
/// Coerce INT96 timestamps to specific TimeUnit
9999
pub coerce_int96: Option<TimeUnit>,
100100
/// Optional parquet FileDecryptionProperties
101+
#[cfg(feature = "parquet_encryption")]
101102
pub file_decryption_properties: Option<Arc<FileDecryptionProperties>>,
102103
/// Rewrite expressions in the context of the file schema
103104
pub(crate) expr_adapter_factory: Option<Arc<dyn PhysicalExprAdapterFactory>>,
@@ -154,6 +155,7 @@ impl FileOpener for ParquetOpener {
154155
let encryption_context = self.get_encryption_context();
155156

156157
Ok(Box::pin(async move {
158+
#[cfg(feature = "parquet_encryption")]
157159
let file_decryption_properties = encryption_context
158160
.get_file_decryption_properties(&file_location)
159161
.await?;

0 commit comments

Comments
 (0)