From 302301659e09c31d5b26b277963d8001caff9fbd Mon Sep 17 00:00:00 2001
From: Dom Dwyer <dom@itsallbroken.com>
Date: Fri, 20 May 2022 12:22:09 +0100
Subject: [PATCH] refactor: derive ParquetFilePath from IoxMetadata

Allow directly converting an IoxMetadata to a ParquetFilePath.
---
 parquet_file/src/lib.rs     | 12 ++++++++++++
 parquet_file/src/storage.rs |  9 +--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/parquet_file/src/lib.rs b/parquet_file/src/lib.rs
index 5b4896dc03..d05120dbe1 100644
--- a/parquet_file/src/lib.rs
+++ b/parquet_file/src/lib.rs
@@ -72,6 +72,18 @@ impl From<&Self> for ParquetFilePath {
     }
 }
 
+impl From<&crate::metadata::IoxMetadata> for ParquetFilePath {
+    fn from(m: &crate::metadata::IoxMetadata) -> Self {
+        Self {
+            namespace_id: m.namespace_id,
+            table_id: m.table_id,
+            sequencer_id: m.sequencer_id,
+            partition_id: m.partition_id,
+            object_store_id: m.object_store_id,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/parquet_file/src/storage.rs b/parquet_file/src/storage.rs
index 29ee69b1b8..559439f504 100644
--- a/parquet_file/src/storage.rs
+++ b/parquet_file/src/storage.rs
@@ -117,14 +117,7 @@ impl ParquetStorage {
             IoxParquetMetaData::try_from(parquet_file_meta).map_err(UploadError::Metadata)?;
 
         // Derive the correct object store path from the metadata.
-        let path = ParquetFilePath::new(
-            meta.namespace_id,
-            meta.table_id,
-            meta.sequencer_id,
-            meta.partition_id,
-            meta.object_store_id,
-        )
-        .object_store_path();
+        let path = ParquetFilePath::from(meta).object_store_path();
 
         let file_size = data.len();
         self.object_store.put(&path, Bytes::from(data)).await?;