Geo type changes

Cargo.toml

@@ -102,6 +102,7 @@ once_cell = "1.20"
 opendal = "0.55.0"
 ordered-float = "4"
 parquet = "57.0"
+parquet-geospatial = "57.0"
 pilota = "0.11.10"
 port_scanner = "0.1.5"
 pretty_assertions = "1.4"
@@ -131,4 +132,4 @@ url = "2.5.7"
 uuid = { version = "1.18", features = ["v7"] }
 volo = "0.10.6"
 volo-thrift = "0.10.8"
-zstd = "0.13.3"
+zstd = "0.13.3"

crates/catalog/glue/src/schema.rs

@@ -165,7 +165,10 @@ impl SchemaVisitor for GlueSchemaBuilder {
             PrimitiveType::Date => "date".to_string(),
             PrimitiveType::Timestamp => "timestamp".to_string(),
             PrimitiveType::TimestampNs => "timestamp_ns".to_string(),
-            PrimitiveType::Timestamptz | PrimitiveType::TimestamptzNs => {
+            PrimitiveType::Timestamptz
+            | PrimitiveType::TimestamptzNs
+            | PrimitiveType::Geometry { .. }
+            | PrimitiveType::Geography { .. } => {
                 return Err(Error::new(
                     ErrorKind::FeatureUnsupported,
                     format!("Conversion from {p:?} is not supported"),

crates/catalog/hms/src/schema.rs

@@ -122,7 +122,10 @@ impl SchemaVisitor for HiveSchemaBuilder {
             PrimitiveType::Date => "date".to_string(),
             PrimitiveType::Timestamp => "timestamp".to_string(),
             PrimitiveType::TimestampNs => "timestamp_ns".to_string(),
-            PrimitiveType::Timestamptz | PrimitiveType::TimestamptzNs => {
+            PrimitiveType::Timestamptz
+            | PrimitiveType::TimestamptzNs
+            | PrimitiveType::Geometry { .. }
+            | PrimitiveType::Geography { .. } => {
                 return Err(Error::new(
                     ErrorKind::FeatureUnsupported,
                     format!("Conversion from {p:?} is not supported"),

crates/iceberg/Cargo.toml

@@ -72,6 +72,7 @@ once_cell = { workspace = true }
 opendal = { workspace = true }
 ordered-float = { workspace = true }
 parquet = { workspace = true, features = ["async"] }
+parquet-geospatial = { workspace = true }
 rand = { workspace = true }
 reqsign = { version = "0.16.3", optional = true, default-features = false }
 reqwest = { workspace = true }

crates/iceberg/src/arrow/schema.rs

@@ -687,6 +687,10 @@ impl SchemaVisitor for ToArrowSchemaConverter {
             crate::spec::PrimitiveType::Binary => {
                 Ok(ArrowSchemaOrFieldOrType::Type(DataType::LargeBinary))
             }
+            crate::spec::PrimitiveType::Geometry { .. }
+            | crate::spec::PrimitiveType::Geography { .. } => {
+                Ok(ArrowSchemaOrFieldOrType::Type(DataType::LargeBinary))
+            }
         }
     }
 }
@@ -1119,6 +1123,9 @@ pub fn datum_to_arrow_type_with_ree(datum: &Datum) -> DataType {
         PrimitiveType::Uuid => make_ree(DataType::Binary),
         PrimitiveType::Fixed(_) => make_ree(DataType::Binary),
         PrimitiveType::Binary => make_ree(DataType::Binary),
+        PrimitiveType::Geometry { .. } | PrimitiveType::Geography { .. } => {
+            make_ree(DataType::Binary)
+        }
         PrimitiveType::Decimal { precision, scale } => {
             make_ree(DataType::Decimal128(*precision as u8, *scale as i8))
         }

crates/iceberg/src/arrow/value.rs

@@ -406,7 +406,9 @@ impl SchemaWithPartnerVisitor<ArrayRef> for ArrowArrayToIcebergStructConverter {
                     .map(|v| v.map(|v| Literal::fixed(v.iter().cloned())))
                     .collect())
             }
-            PrimitiveType::Binary => {
+            PrimitiveType::Binary
+            | PrimitiveType::Geometry { .. }
+            | PrimitiveType::Geography { .. } => {
                 if let Some(array) = partner.as_any().downcast_ref::<LargeBinaryArray>() {
                     Ok(array
                         .iter()
@@ -420,7 +422,7 @@ impl SchemaWithPartnerVisitor<ArrayRef> for ArrowArrayToIcebergStructConverter {
                 } else {
                     Err(Error::new(
                         ErrorKind::DataInvalid,
-                        "The partner is not a binary array",
+                        format!("The partner is not a binary array: {:?}", p),
                     ))
                 }
             }

crates/iceberg/src/avro/schema.rs

@@ -240,6 +240,7 @@ impl SchemaVisitor for SchemaToAvroSchema {
             PrimitiveType::Decimal { precision, scale } => {
                 avro_decimal_schema(*precision as usize, *scale as usize)?
             }
+            PrimitiveType::Geometry { .. } | PrimitiveType::Geography { .. } => todo!(),
         };
         Ok(Either::Left(avro_schema))
     }