Skip to content

Commit

Permalink
Rename decryption module to decrypt. This is because we'll introduce …
Browse files Browse the repository at this point in the history
…encryption module later and we'll have to name it encrypt to not clash with the super module name (encryption). It would be odd to have sub modules called encrypt and decryption.
  • Loading branch information
rok committed Mar 10, 2025
1 parent c4737a4 commit 99e2b6d
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions parquet/src/arrow/arrow_reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/async_reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/async_reader/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion parquet/src/encryption/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion parquet/src/file/metadata/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/metadata/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/serialized_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/util/test_common/encryption_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 99e2b6d

Please sign in to comment.