Skip to content

Commit d263510

Browse files
committed
Fix CI
1 parent 6f055f9 commit d263510

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

parquet/src/arrow/arrow_reader/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ impl<T: ChunkReader + 'static> ParquetRecordBatchReaderBuilder<T> {
539539
Ok(Self::new_with_metadata(reader, metadata))
540540
}
541541

542+
/// Create a new [`ParquetRecordBatchReaderBuilder`] with [`ArrowReaderOptions`] and [`FileDecryptionProperties`]
542543
pub fn try_new_with_decryption(
543544
reader: T,
544545
options: ArrowReaderOptions,
@@ -569,6 +570,7 @@ impl<T: ChunkReader + 'static> ParquetRecordBatchReaderBuilder<T> {
569570
/// # use arrow_schema::{DataType, Field, Schema};
570571
/// # use parquet::arrow::arrow_reader::{ArrowReaderMetadata, ParquetRecordBatchReader, ParquetRecordBatchReaderBuilder};
571572
/// # use parquet::arrow::ArrowWriter;
573+
/// #
572574
/// # let mut file: Vec<u8> = Vec::with_capacity(1024);
573575
/// # let schema = Arc::new(Schema::new(vec![Field::new("i32", DataType::Int32, false)]));
574576
/// # let mut writer = ArrowWriter::try_new(&mut file, schema.clone(), None).unwrap();
@@ -577,7 +579,7 @@ impl<T: ChunkReader + 'static> ParquetRecordBatchReaderBuilder<T> {
577579
/// # writer.close().unwrap();
578580
/// # let file = Bytes::from(file);
579581
/// #
580-
/// let metadata = ArrowReaderMetadata::load(&file, Default::default()).unwrap();
582+
/// let metadata = ArrowReaderMetadata::load(&file, Default::default(), None).unwrap();
581583
/// let mut a = ParquetRecordBatchReaderBuilder::new_with_metadata(file.clone(), metadata.clone()).build().unwrap();
582584
/// let mut b = ParquetRecordBatchReaderBuilder::new_with_metadata(file, metadata).build().unwrap();
583585
///
@@ -804,6 +806,9 @@ impl ParquetRecordBatchReader {
804806
.build()
805807
}
806808

809+
/// Create a new [`ParquetRecordBatchReader`] from the provided chunk reader and [`FileDecryptionProperties`]
810+
///
811+
/// Note: this is needed when the parquet file is encrypted
807812
pub fn try_new_with_decryption<T: ChunkReader + 'static>(
808813
reader: T,
809814
batch_size: usize,

parquet/src/arrow/async_reader/metadata.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,15 @@ impl<F: MetadataFetch> MetadataLoader<F> {
127127
let (metadata, remainder) = if length > suffix_len - FOOTER_SIZE {
128128
let metadata_start = file_size - length - FOOTER_SIZE;
129129
let meta = fetch.fetch(metadata_start..file_size - FOOTER_SIZE).await?;
130-
(ParquetMetaDataReader::decode_metadata(&meta)?, None)
130+
// TODO: this won't decrypt
131+
(ParquetMetaDataReader::decode_metadata(&meta, None)?, None)
131132
} else {
132133
let metadata_start = file_size - length - FOOTER_SIZE - footer_start;
133134

134135
let slice = &suffix[metadata_start..suffix_len - FOOTER_SIZE];
135136
(
136-
ParquetMetaDataReader::decode_metadata(slice)?,
137+
// TODO: this won't decrypt
138+
ParquetMetaDataReader::decode_metadata(slice, None)?,
137139
Some((footer_start, suffix.slice(..metadata_start))),
138140
)
139141
};

parquet/src/encryption/ciphers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ pub fn create_footer_aad(file_aad: &[u8]) -> Result<Vec<u8>> {
171171
create_module_aad(file_aad, ModuleType::Footer, -1, -1, -1)
172172
}
173173

174-
pub fn create_module_aad(file_aad: &[u8], module_type: ModuleType, row_group_ordinal: i32,
174+
fn create_module_aad(file_aad: &[u8], module_type: ModuleType, row_group_ordinal: i32,
175175
column_ordinal: i32, page_ordinal: i32) -> Result<Vec<u8>> {
176176

177177
let module_buf = [module_type as u8];

0 commit comments

Comments
 (0)