diff --git a/parquet/src/arrow/arrow_reader/mod.rs b/parquet/src/arrow/arrow_reader/mod.rs index 8bfc38f7c87..9eb03640c8b 100644 --- a/parquet/src/arrow/arrow_reader/mod.rs +++ b/parquet/src/arrow/arrow_reader/mod.rs @@ -33,7 +33,7 @@ use crate::arrow::schema::{parquet_to_arrow_schema_and_fields, ParquetField}; use crate::arrow::{parquet_to_arrow_field_levels, FieldLevels, ProjectionMask}; use crate::column::page::{PageIterator, PageReader}; #[cfg(feature = "encryption")] -use crate::encryption::decryption::{CryptoContext, FileDecryptionProperties}; +use crate::encryption::decrypt::{CryptoContext, FileDecryptionProperties}; use crate::errors::{ParquetError, Result}; use crate::file::metadata::{ParquetMetaData, ParquetMetaDataReader}; use crate::file::reader::{ChunkReader, SerializedPageReader}; @@ -1019,7 +1019,7 @@ mod tests { FloatType, Int32Type, Int64Type, Int96Type, }; #[cfg(feature = "encryption")] - use crate::encryption::decryption::FileDecryptionProperties; + use crate::encryption::decrypt::FileDecryptionProperties; use crate::errors::Result; use crate::file::properties::{EnabledStatistics, WriterProperties, WriterVersion}; use crate::file::writer::SerializedFileWriter; diff --git a/parquet/src/arrow/async_reader/mod.rs b/parquet/src/arrow/async_reader/mod.rs index 3a4be3789c3..9f75fabc308 100644 --- a/parquet/src/arrow/async_reader/mod.rs +++ b/parquet/src/arrow/async_reader/mod.rs @@ -62,7 +62,7 @@ mod metadata; pub use metadata::*; #[cfg(feature = "encryption")] -use crate::encryption::decryption::{CryptoContext, FileDecryptionProperties}; +use crate::encryption::decrypt::{CryptoContext, FileDecryptionProperties}; #[cfg(feature = "object_store")] mod store; diff --git a/parquet/src/arrow/async_reader/store.rs b/parquet/src/arrow/async_reader/store.rs index 3fe8d2d655e..a2c730e786a 100644 --- a/parquet/src/arrow/async_reader/store.rs +++ b/parquet/src/arrow/async_reader/store.rs @@ -24,7 +24,7 @@ use tokio::runtime::Handle; use crate::arrow::async_reader::AsyncFileReader; #[cfg(feature = "encryption")] -use crate::encryption::decryption::FileDecryptionProperties; +use crate::encryption::decrypt::FileDecryptionProperties; use crate::errors::{ParquetError, Result}; use crate::file::metadata::{ParquetMetaData, ParquetMetaDataReader}; diff --git a/parquet/src/encryption/decryption.rs b/parquet/src/encryption/decrypt.rs similarity index 100% rename from parquet/src/encryption/decryption.rs rename to parquet/src/encryption/decrypt.rs diff --git a/parquet/src/encryption/mod.rs b/parquet/src/encryption/mod.rs index 362906f5013..6e9168edb9f 100644 --- a/parquet/src/encryption/mod.rs +++ b/parquet/src/encryption/mod.rs @@ -19,5 +19,5 @@ //! in the [spec](https://github.com/apache/parquet-format/blob/master/Encryption.md). pub(crate) mod ciphers; -pub(crate) mod decryption; +pub(crate) mod decrypt; pub(crate) mod modules; diff --git a/parquet/src/file/metadata/mod.rs b/parquet/src/file/metadata/mod.rs index 76ba935a91f..217685049ea 100644 --- a/parquet/src/file/metadata/mod.rs +++ b/parquet/src/file/metadata/mod.rs @@ -98,7 +98,7 @@ mod writer; use crate::basic::{ColumnOrder, Compression, Encoding, Type}; #[cfg(feature = "encryption")] use crate::encryption::{ - decryption::FileDecryptor, + decrypt::FileDecryptor, modules::{create_module_aad, ModuleType}, }; use crate::errors::{ParquetError, Result}; diff --git a/parquet/src/file/metadata/reader.rs b/parquet/src/file/metadata/reader.rs index b5b1fe99ff0..1899db0deb6 100644 --- a/parquet/src/file/metadata/reader.rs +++ b/parquet/src/file/metadata/reader.rs @@ -22,7 +22,7 @@ use bytes::Bytes; use crate::basic::ColumnOrder; #[cfg(feature = "encryption")] use crate::encryption::{ - decryption::{FileDecryptionProperties, FileDecryptor}, + decrypt::{FileDecryptionProperties, FileDecryptor}, modules::create_footer_aad, }; diff --git a/parquet/src/file/serialized_reader.rs b/parquet/src/file/serialized_reader.rs index 2888eb11c34..2673f4ac52a 100644 --- a/parquet/src/file/serialized_reader.rs +++ b/parquet/src/file/serialized_reader.rs @@ -23,7 +23,7 @@ use crate::bloom_filter::Sbbf; use crate::column::page::{Page, PageMetadata, PageReader}; use crate::compression::{create_codec, Codec}; #[cfg(feature = "encryption")] -use crate::encryption::decryption::{read_and_decrypt, CryptoContext}; +use crate::encryption::decrypt::{read_and_decrypt, CryptoContext}; use crate::errors::{ParquetError, Result}; use crate::file::page_index::offset_index::OffsetIndexMetaData; use crate::file::{ diff --git a/parquet/src/util/test_common/encryption_util.rs b/parquet/src/util/test_common/encryption_util.rs index 51d6f701db8..2f6e5bc4563 100644 --- a/parquet/src/util/test_common/encryption_util.rs +++ b/parquet/src/util/test_common/encryption_util.rs @@ -19,7 +19,7 @@ use crate::arrow::arrow_reader::{ ArrowReaderMetadata, ArrowReaderOptions, ParquetRecordBatchReaderBuilder, }; use crate::arrow::ParquetRecordBatchStreamBuilder; -use crate::encryption::decryption::FileDecryptionProperties; +use crate::encryption::decrypt::FileDecryptionProperties; use crate::errors::ParquetError; use crate::file::metadata::FileMetaData; use arrow_array::cast::AsArray;