fix

Author: rok

parquet/src/encryption/encrypt.rs

@@ -26,6 +26,7 @@ use ring::rand::{SecureRandom, SystemRandom};
 use std::collections::{HashMap, HashSet};
 use std::io::Write;
 use thrift::protocol::TCompactOutputProtocol;
+use crate::format::{AesGcmV1, EncryptionAlgorithm};
 
 #[derive(Debug, Clone, PartialEq)]
 struct EncryptionKey {
@@ -360,6 +361,26 @@ impl FileEncryptor {
             Some(column_key) => Ok(Box::new(RingGcmBlockEncryptor::new(column_key.key())?)),
         }
     }
+    
+    /// Get encryption algorithm for the plaintext footer
+    pub(crate) fn get_footer_encryptor_for_plaintext(&self) -> Result<Option<EncryptionAlgorithm>> {
+        if !self.properties.encrypt_footer() {
+            let supply_aad_prefix = self.properties
+                .aad_prefix()
+                .map(|_| !self.properties.store_aad_prefix());
+            let encryption_algorithm = Some(EncryptionAlgorithm::AESGCMV1(AesGcmV1 {
+                aad_prefix: if self.properties.store_aad_prefix() {
+                    self.properties.aad_prefix().cloned()
+                } else {
+                    None
+                },
+                aad_file_unique: Some(self.aad_file_unique().clone()),
+                supply_aad_prefix,
+            }));
+            return Ok(encryption_algorithm);
+        }
+        Ok(None)
+    }
 }
 
 /// Write an encrypted Thrift serializable object

parquet/src/file/metadata/writer.rs

@@ -142,23 +142,13 @@ impl<'a, W: Write> ThriftMetadataWriter<'a, W> {
             .object_writer
             .apply_row_group_encryption(self.row_groups)?;
 
-        let mut encryption_algorithm = None;
-        if let Some(file_encryptor) = self.object_writer.file_encryptor.clone() {
-            let properties = file_encryptor.properties();
-            if !properties.encrypt_footer() {
-                let supply_aad_prefix = properties
-                    .aad_prefix()
-                    .map(|_| !properties.store_aad_prefix());
-                encryption_algorithm = Some(EncryptionAlgorithm::AESGCMV1(AesGcmV1 {
-                    aad_prefix: if properties.store_aad_prefix() {
-                        properties.aad_prefix().cloned()
-                    } else {
-                        None
-                    },
-                    aad_file_unique: Some(file_encryptor.aad_file_unique().clone()),
-                    supply_aad_prefix,
-                }));
-            }
+        #[cfg(not(feature = "encryption"))]
+        let encryption_algorithm = None;
+
+        #[cfg(feature = "encryption")]
+        let encryption_algorithm = match &self.object_writer.file_encryptor {
+            Some(file_encryptor) => file_encryptor.get_footer_encryptor_for_plaintext()?,
+            _ => None,
         };
 
         let mut file_metadata = FileMetaData {