Merge remote-tracking branch 'origin/main' into explicit_get_metadata…

…_with_options

# Conflicts:
#	parquet/src/arrow/async_reader/store.rs
#	parquet/tests/arrow_reader/encryption_async.rs

parquet/src/arrow/async_reader/store.rs

@@ -199,7 +199,6 @@ impl AsyncFileReader for ParquetObjectReader {
         options: Option<&'a ArrowReaderOptions>,
     ) -> BoxFuture<'a, Result<Arc<ParquetMetaData>>> {
         Box::pin(async move {
-            let file_size = self.meta.size;
             let mut metadata = ParquetMetaDataReader::new()
                 .with_column_indexes(self.preload_column_index)
                 .with_offset_indexes(self.preload_offset_index)

parquet/tests/arrow_reader/encryption_async.rs

@@ -276,8 +276,8 @@ async fn test_read_encrypted_file_from_object_store() {
         .unwrap();
     let options = ArrowReaderOptions::new().with_file_decryption_properties(decryption_properties);
 
-    let mut reader = ParquetObjectReader::new(store, meta);
-    let metadata = reader.get_metadata(Some(&options)).await.unwrap();
+    let mut reader = ParquetObjectReader::new(store, meta.location).with_file_size(meta.size);
+    let metadata = reader.get_metadata_with_options(Some(&options)).await.unwrap();
     let builder = ParquetRecordBatchStreamBuilder::new_with_options(reader, options)
         .await
         .unwrap();