From 42d7e8bcd709b5a89b5e063f1ec8ad2e4cd152d0 Mon Sep 17 00:00:00 2001
From: ninglinLiu <x07514475479@gmail.com>
Date: Sun, 25 Oct 2026 23:37:18 +0800
Subject: [PATCH 1/2] fix(spec): reject non-finite partition values when
 writing DataFile JSON

---
 crates/iceberg/src/spec/manifest/mod.rs | 91 +++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/crates/iceberg/src/spec/manifest/mod.rs b/crates/iceberg/src/spec/manifest/mod.rs
index f4269638a2..633db82a52 100644
--- a/crates/iceberg/src/spec/manifest/mod.rs
+++ b/crates/iceberg/src/spec/manifest/mod.rs
@@ -175,12 +175,43 @@ pub fn serialize_data_file_to_json(
     partition_type: &super::StructType,
     format_version: FormatVersion,
 ) -> Result<String> {
+    ensure_finite_partition_values(data_file.partition(), partition_type)?;
     let partition_struct_type = Type::Struct(partition_type.clone());
     let serde = _serde::DataFileSerde::try_from(data_file, &partition_struct_type, format_version)?;
     serde_json::to_string(&serde)
         .map_err(|e| invalid_data!("Failed to serialize DataFile to JSON!").with_source(e))
 }
 
+/// JSON has no representation for NaN or infinity, and `serde_json` writes
+/// them as `null`. A float or double partition value that is not finite would
+/// therefore read back as a null partition value, so reject it instead.
+fn ensure_finite_partition_values(
+    partition: &Struct,
+    partition_type: &super::StructType,
+) -> Result<()> {
+    for (field, value) in partition_type.fields().iter().zip(partition.iter()) {
+        let non_finite = match value {
+            Some(super::Literal::Primitive(super::PrimitiveLiteral::Float(v))) => {
+                (!v.0.is_finite()).then(|| v.0.to_string())
+            }
+            Some(super::Literal::Primitive(super::PrimitiveLiteral::Double(v))) => {
+                (!v.0.is_finite()).then(|| v.0.to_string())
+            }
+            _ => None,
+        };
+        if let Some(value) = non_finite {
+            return Err(Error::new(
+                crate::ErrorKind::DataInvalid,
+                format!(
+                    "Cannot serialize DataFile to JSON: partition field '{}' has non-finite value {value}, which JSON cannot represent",
+                    field.name
+                ),
+            ));
+        }
+    }
+    Ok(())
+}
+
 /// Deserialize a DataFile from a JSON string.
 pub fn deserialize_data_file_from_json(
     json: &str,
@@ -1409,6 +1440,66 @@ mod tests {
         assert_eq!(deserialized_data_file2, original_data_file2);
     }
 
+    #[test]
+    fn test_data_file_to_json_rejects_non_finite_partition_values() {
+        let schema = Schema::builder()
+            .with_fields(vec![
+                NestedField::optional(1, "f", Type::Primitive(PrimitiveType::Float)).into(),
+                NestedField::optional(2, "d", Type::Primitive(PrimitiveType::Double)).into(),
+            ])
+            .build()
+            .unwrap();
+        let partition_spec = PartitionSpec::builder(schema.clone())
+            .with_spec_id(1)
+            .add_partition_field("f", "f", Transform::Identity)
+            .unwrap()
+            .add_partition_field("d", "d", Transform::Identity)
+            .unwrap()
+            .build()
+            .unwrap();
+        let partition_type = partition_spec.partition_type(&schema).unwrap();
+
+        let data_file = |f: f32, d: f64| {
+            DataFileBuilder::default()
+                .content(DataContentType::Data)
+                .file_format(DataFileFormat::Parquet)
+                .file_path("path/to/file.parquet".to_string())
+                .file_size_in_bytes(1024)
+                .record_count(1)
+                .partition_spec_id(1)
+                .partition(Struct::from_iter([
+                    Some(Literal::float(f)),
+                    Some(Literal::double(d)),
+                ]))
+                .build()
+                .unwrap()
+        };
+
+        let json =
+            serialize_data_file_to_json(data_file(1.5, -2.25), &partition_type, FormatVersion::V2)
+                .unwrap();
+        let round_trip =
+            deserialize_data_file_from_json(&json, 1, &partition_type, &schema).unwrap();
+        assert_eq!(round_trip, data_file(1.5, -2.25));
+
+        for (f, d, field) in [
+            (f32::NAN, 1.0, "f"),
+            (f32::INFINITY, 1.0, "f"),
+            (1.0, f64::NAN, "d"),
+            (1.0, f64::NEG_INFINITY, "d"),
+        ] {
+            let err =
+                serialize_data_file_to_json(data_file(f, d), &partition_type, FormatVersion::V2)
+                    .unwrap_err();
+            assert_eq!(err.kind(), ErrorKind::DataInvalid);
+            assert!(
+                err.message()
+                    .contains(&format!("partition field '{field}' has non-finite value")),
+                "{err}"
+            );
+        }
+    }
+
     /// Metadata for the writer schema tests: a V2 data manifest whose spec has
     /// identity partitions on a long, a string, and a double column.
     fn writer_schema_test_metadata() -> ManifestMetadata {

From 5fb624fc771d81cfaf5b74a7c37d29ced00497c2 Mon Sep 17 00:00:00 2001
From: ninglinLiu <224592858+ninglinLiu@users.noreply.github.com>
Date: Tue, 27 Oct 2026 13:36:44 +0800
Subject: [PATCH 2/2] ci: re-run checks now that the ASF allowlist check is
 fixed on main