Don't serialize empty array metadata (#678)

geoarrow · Jul 24, 2024 · 2035705 · 2035705
1 parent 1c7a3bc
commit 2035705
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 40 deletions.
diff --git a/src/array/binary/array.rs b/src/array/binary/array.rs
@@ -107,10 +107,12 @@ impl<O: OffsetSizeTrait> GeometryArrayTrait for WKBArray<O> {
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/geometrycollection/array.rs b/src/array/geometrycollection/array.rs
@@ -110,10 +110,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for GeometryCollecti
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/linestring/array.rs b/src/array/linestring/array.rs
@@ -162,10 +162,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for LineStringArray<
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/metadata.rs b/src/array/metadata.rs
@@ -36,6 +36,14 @@ pub struct ArrayMetadata {
     pub edges: Option<Edges>,
 }
 
+impl ArrayMetadata {
+    /// Decide whether this [ArrayMetadata] should be written to Arrow metadata (aka if it is
+    /// non-empty)
+    pub fn should_serialize(&self) -> bool {
+        self.crs.is_some() || self.edges.is_some()
+    }
+}
+
 impl TryFrom<&Field> for ArrayMetadata {
     type Error = GeoArrowError;
 

diff --git a/src/array/mixed/array.rs b/src/array/mixed/array.rs
@@ -317,10 +317,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for MixedGeometryArr
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/multilinestring/array.rs b/src/array/multilinestring/array.rs
@@ -199,10 +199,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for MultiLineStringA
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/multipoint/array.rs b/src/array/multipoint/array.rs
@@ -162,10 +162,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for MultiPointArray<
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/multipolygon/array.rs b/src/array/multipolygon/array.rs
@@ -236,10 +236,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for MultiPolygonArra
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/point/array.rs b/src/array/point/array.rs
@@ -124,10 +124,12 @@ impl<const D: usize> GeometryArrayTrait for PointArray<D> {
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/polygon/array.rs b/src/array/polygon/array.rs
@@ -200,10 +200,12 @@ impl<O: OffsetSizeTrait, const D: usize> GeometryArrayTrait for PolygonArray<O,
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 

diff --git a/src/array/rect/array.rs b/src/array/rect/array.rs
@@ -110,10 +110,12 @@ impl<const D: usize> GeometryArrayTrait for RectArray<D> {
             "ARROW:extension:name".to_string(),
             self.extension_name().to_string(),
         );
-        metadata.insert(
-            "ARROW:extension:metadata".to_string(),
-            serde_json::to_string(self.metadata.as_ref()).unwrap(),
-        );
+        if self.metadata.should_serialize() {
+            metadata.insert(
+                "ARROW:extension:metadata".to_string(),
+                serde_json::to_string(self.metadata.as_ref()).unwrap(),
+            );
+        }
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }