Skip to content

Commit 9196ed0

Browse files
committed
fix
1 parent 6045c77 commit 9196ed0

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

.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

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ rpath = false
198198
strip = false # Retain debug info for flamegraphs
199199

200200
[profile.ci]
201+
debug = false
201202
inherits = "dev"
202203
incremental = false
203204

datafusion/datasource-parquet/src/opener.rs

Lines changed: 6 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>>,
@@ -151,9 +152,11 @@ impl FileOpener for ParquetOpener {
151152
let mut predicate_file_schema = Arc::clone(&self.logical_file_schema);
152153

153154
let enable_page_index = self.enable_page_index;
155+
#[cfg(feature = "parquet_encryption")]
154156
let encryption_context = self.get_encryption_context();
155157

156158
Ok(Box::pin(async move {
159+
#[cfg(feature = "parquet_encryption")]
157160
let file_decryption_properties = encryption_context
158161
.get_file_decryption_properties(&file_location)
159162
.await?;
@@ -502,6 +505,7 @@ where
502505
}
503506

504507
#[derive(Default)]
508+
#[cfg_attr(not(feature = "parquet_encryption"), allow(dead_code))]
505509
struct EncryptionContext {
506510
#[cfg(feature = "parquet_encryption")]
507511
file_decryption_properties: Option<Arc<FileDecryptionProperties>>,
@@ -544,6 +548,7 @@ impl EncryptionContext {
544548
}
545549

546550
#[cfg(not(feature = "parquet_encryption"))]
551+
#[allow(dead_code)]
547552
impl EncryptionContext {
548553
async fn get_file_decryption_properties(
549554
&self,
@@ -563,6 +568,7 @@ impl ParquetOpener {
563568
}
564569

565570
#[cfg(not(feature = "parquet_encryption"))]
571+
#[allow(dead_code)]
566572
fn get_encryption_context(&self) -> EncryptionContext {
567573
EncryptionContext::default()
568574
}

datafusion/datasource-parquet/src/source.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ use datafusion_physical_plan::metrics::Count;
5252
use datafusion_physical_plan::metrics::ExecutionPlanMetricsSet;
5353
use datafusion_physical_plan::DisplayFormatType;
5454

55-
use datafusion_common::encryption::map_config_decryption_to_decryption;
5655
#[cfg(feature = "parquet_encryption")]
5756
use datafusion_execution::parquet_encryption::EncryptionFactory;
5857
use itertools::Itertools;
@@ -541,6 +540,7 @@ impl FileSource for ParquetSource {
541540
Arc::new(DefaultParquetFileReaderFactory::new(object_store)) as _
542541
});
543542

543+
#[cfg(feature = "parquet_encryption")]
544544
let file_decryption_properties = self
545545
.table_parquet_options()
546546
.crypto
@@ -576,6 +576,7 @@ impl FileSource for ParquetSource {
576576
enable_row_group_stats_pruning: self.table_parquet_options.global.pruning,
577577
schema_adapter_factory,
578578
coerce_int96,
579+
#[cfg(feature = "parquet_encryption")]
579580
file_decryption_properties,
580581
expr_adapter_factory,
581582
#[cfg(feature = "parquet_encryption")]

0 commit comments

Comments
 (0)