Apply suggestions from code review

Co-authored-by: Adam Reeve <[email protected]>
apache · Mar 10, 2025 · c805b51 · c805b51
1 parent 276fc1a
commit c805b51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/parquet/src/encryption/decryption.rs b/parquet/src/encryption/decryption.rs
@@ -212,10 +212,7 @@ impl FileDecryptor {
         let file_aad = [aad_prefix.as_slice(), aad_file_unique.as_slice()].concat();
         // todo decr: if no key available yet (not set in properties, should be retrieved from metadata)
         let footer_decryptor = RingGcmBlockDecryptor::new(&decryption_properties.footer_key)
-            .map_err(|e| {
-                let msg = String::from("Invalid footer key. ")
-                    + e.to_string().replace("Parquet error: ", "").as_str();
-                ParquetError::General(msg)
+            .map_err(|e| general_err!("Invalid footer key. {}", e.to_string().replace("Parquet error: ", "")))?;
             })?;
 
         Ok(Self {

diff --git a/parquet/src/file/metadata/mod.rs b/parquet/src/file/metadata/mod.rs
@@ -234,8 +234,8 @@ impl ParquetMetaData {
 
     /// Returns file decryptor as reference.
     #[cfg(feature = "encryption")]
-    pub fn file_decryptor(&self) -> &Option<FileDecryptor> {
-        &self.file_decryptor
+    pub fn file_decryptor(&self) -> Option<&FileDecryptor> {
+        self.file_decryptor.as_ref()
     }
 
     /// Returns number of row groups in this file.