minor changes

Author: rok

parquet/src/arrow/arrow_writer/mod.rs

@@ -3551,10 +3551,9 @@ mod tests {
 
         let file = tempfile::tempfile().unwrap();
 
-        // todo: add encryption
-        let key_code: &[u8] = "0123456789012345".as_bytes();
+        let footer_key: &[u8] = "0123456789012345".as_bytes();
         let file_encryption_properties =
-            FileEncryptionProperties::builder(key_code.to_vec()).build();
+            FileEncryptionProperties::builder(footer_key.to_vec()).build();
 
         let props = WriterProperties::builder()
             .set_max_row_group_size(200)
@@ -3571,19 +3570,14 @@ mod tests {
 
         writer.close().unwrap();
 
-        // let footer_key = "0123456789012345".as_bytes();
-        // let column_key = "1234567890123450".as_bytes();
-        let false_key = "1234567890123451".as_bytes();
-
-        let decryption_properties = FileDecryptionProperties::builder(false_key.to_vec())
-            .with_column_key("int".as_bytes().to_vec(), false_key.to_vec())
+        let decryption_properties = FileDecryptionProperties::builder(footer_key.to_vec())
+            // .with_column_key("int".as_bytes().to_vec(), footer_key.to_vec())
             .build()
             .unwrap();
 
         let options =
             ArrowReaderOptions::new().with_file_decryption_properties(decryption_properties);
 
-        // todo: remove with_file_decryption_properties from things that are not ArrowReaderOptions
         let builder = ParquetRecordBatchReaderBuilder::try_new_with_options(file, options).unwrap();
         assert_eq!(&row_group_sizes(builder.metadata()), &[200, 200, 50]);
 

parquet/src/file/writer.rs

@@ -579,15 +579,15 @@ impl<'a, W: Write + Send> SerializedRowGroupWriter<'a, W> {
                 #[cfg(feature = "encryption")]
                 let row_group_index = self.row_group_index as usize;
                 #[cfg(feature = "encryption")]
-                let column_index = self.column_index - 1;
+                let column_ordinal = self.column_index;
 
                 let (buf, on_close) = self.get_on_close();
                 #[cfg(feature = "encryption")]
                 let mut page_writer = SerializedPageWriter::new(buf);
                 #[cfg(feature = "encryption")]
                 {
                     page_writer.with_row_group_ordinal(row_group_index);
-                    page_writer.with_column_ordinal(column_index);
+                    page_writer.with_column_ordinal(column_ordinal);
                     page_writer.with_file_encryptor(file_encryptor);
                 }
 
@@ -790,7 +790,7 @@ impl<'a, W: Write> SerializedPageWriter<'a, W> {
             #[cfg(feature = "encryption")]
             page_ordinal: 0,
             #[cfg(feature = "encryption")]
-            column_ordinal: 1,
+            column_ordinal: 0,
             #[cfg(feature = "encryption")]
             row_group_ordinal: 0,
         }