inline hashmap

Signed-off-by: Andrew Duffy <[email protected]>

Author: a10y

vortex-file/src/strategy.rs

@@ -31,7 +31,7 @@ const ONE_MEG: u64 = 1 << 20;
 pub struct WriteStrategyBuilder {
     compressor: Option<Arc<dyn CompressorPlugin>>,
     row_block_size: usize,
-    field_writers: Option<HashMap<FieldPath, Arc<dyn LayoutStrategy>>>,
+    field_writers: HashMap<FieldPath, Arc<dyn LayoutStrategy>>,
 }
 
 impl Default for WriteStrategyBuilder {
@@ -43,11 +43,11 @@ impl Default for WriteStrategyBuilder {
 impl WriteStrategyBuilder {
     /// Create a new empty builder. It can be further configured, and then finally built
     /// yielding the [`LayoutStrategy`].
-    pub const fn new() -> Self {
+    pub fn new() -> Self {
         Self {
             compressor: None,
             row_block_size: 8192,
-            field_writers: None,
+            field_writers: HashMap::new(),
         }
     }
 
@@ -73,9 +73,7 @@ impl WriteStrategyBuilder {
         field: impl Into<FieldPath>,
         writer: Arc<dyn LayoutStrategy>,
     ) -> Self {
-        let mut writers = self.field_writers.unwrap_or_default();
-        writers.insert(field.into(), writer);
-        self.field_writers = Some(writers);
+        self.field_writers.insert(field.into(), writer);
         self
     }
 
@@ -143,14 +141,9 @@ impl WriteStrategyBuilder {
         // 0. start with splitting columns
         let validity_strategy = CollectStrategy::new(compress_then_flat);
 
-        let table_strategy = PathStrategy::new(Arc::new(validity_strategy), Arc::new(repartition));
-
         // Take any field overrides from the builder and apply them to the final strategy.
-        let table_strategy = if let Some(overrides) = self.field_writers {
-            table_strategy.set_field_writers(overrides)
-        } else {
-            table_strategy
-        };
+        let table_strategy = PathStrategy::new(Arc::new(validity_strategy), Arc::new(repartition))
+            .with_field_writers(self.field_writers);
 
         Arc::new(table_strategy)
     }

vortex-file/tests/test_write_table.rs

@@ -74,7 +74,7 @@ async fn test_file_roundtrip() {
 
     let writer = Arc::new(
         PathStrategy::new(Arc::new(FlatLayoutStrategy::default()), default_strategy)
-            .set_field_writer(field_path!(a.raw), Arc::new(FlatLayoutStrategy::default())),
+            .with_field_writer(field_path!(a.raw), Arc::new(FlatLayoutStrategy::default())),
     );
 
     let mut bytes = Vec::new();

vortex-layout/src/layouts/path.rs

@@ -103,12 +103,12 @@ impl PathStrategy {
     ///         Arc::new(FlatLayoutStrategy::default()),
     ///         Arc::new(compress_btrblocks),
     ///     )
-    ///     .set_field_writer(
+    ///     .with_field_writer(
     ///         field_path!(request.body.bytes),
     ///         Arc::new(compress_compact),
     ///     );
     /// ```
-    pub fn set_field_writer(
+    pub fn with_field_writer(
         mut self,
         field_path: impl Into<FieldPath>,
         writer: Arc<dyn LayoutStrategy>,
@@ -120,7 +120,7 @@ impl PathStrategy {
     /// Set writers for several fields at once.
     ///
     /// See also: [`set_field_writer`][Self::set_field_writer].
-    pub fn set_field_writers(
+    pub fn with_field_writers(
         mut self,
         writers: impl IntoIterator<Item = (FieldPath, Arc<dyn LayoutStrategy>)>,
     ) -> Self {