neilconway commented on code in PR #22105:
URL: https://github.com/apache/datafusion/pull/22105#discussion_r3234878911
##########
datafusion/substrait/src/logical_plan/consumer/types.rs:
##########
@@ -347,12 +347,96 @@ fn from_substrait_struct_type(
) -> datafusion::common::Result<Fields> {
let mut fields = vec![];
for (i, f) in s.types.iter().enumerate() {
- let field = Field::new(
- next_struct_field_name(i, dfs_names, name_idx)?,
- from_substrait_type(consumer, f, dfs_names, name_idx)?,
- true, // We assume everything to be nullable since that's easier
than ensuring it matches
- );
+ let name = next_struct_field_name(i, dfs_names, name_idx)?;
+ let data_type = from_substrait_type(consumer, f, dfs_names, name_idx)?;
+ let field = Field::new(name, data_type, type_is_nullable(f));
fields.push(field);
}
Ok(fields.into())
}
+
+fn type_is_nullable(dt: &Type) -> bool {
+ let Some(kind) = dt.kind.as_ref() else {
+ return true;
+ };
+
+ let nullability = match kind {
+ r#type::Kind::Bool(boolean) => boolean.nullability,
+ r#type::Kind::I8(integer) => integer.nullability,
+ r#type::Kind::I16(integer) => integer.nullability,
+ r#type::Kind::I32(integer) => integer.nullability,
+ r#type::Kind::I64(integer) => integer.nullability,
+ r#type::Kind::Fp32(float) => float.nullability,
+ r#type::Kind::Fp64(float) => float.nullability,
+ #[expect(deprecated)]
+ r#type::Kind::Timestamp(timestamp) => timestamp.nullability,
+ r#type::Kind::Date(date) => date.nullability,
+ #[expect(deprecated)]
+ r#type::Kind::Time(time) => time.nullability,
+ #[expect(deprecated)]
+ r#type::Kind::TimestampTz(timestamp) => timestamp.nullability,
+ r#type::Kind::IntervalYear(interval) => interval.nullability,
+ r#type::Kind::IntervalDay(interval) => interval.nullability,
+ r#type::Kind::IntervalCompound(interval) => interval.nullability,
+ r#type::Kind::Uuid(uuid) => uuid.nullability,
+ r#type::Kind::String(string) => string.nullability,
+ r#type::Kind::Binary(binary) => binary.nullability,
+ r#type::Kind::FixedChar(fixed) => fixed.nullability,
+ r#type::Kind::Varchar(varchar) => varchar.nullability,
+ r#type::Kind::FixedBinary(fixed) => fixed.nullability,
+ r#type::Kind::Decimal(decimal) => decimal.nullability,
+ r#type::Kind::PrecisionTime(time) => time.nullability,
+ r#type::Kind::PrecisionTimestamp(timestamp) => timestamp.nullability,
+ r#type::Kind::PrecisionTimestampTz(timestamp) => timestamp.nullability,
+ r#type::Kind::Struct(r#struct) => r#struct.nullability,
+ r#type::Kind::List(list) => list.nullability,
+ r#type::Kind::Map(map) => map.nullability,
+ r#type::Kind::Func(func) => func.nullability,
+ r#type::Kind::UserDefined(user_defined) => user_defined.nullability,
+ #[expect(deprecated)]
+ r#type::Kind::UserDefinedTypeReference(_) =>
r#type::Nullability::Required as i32,
+ r#type::Kind::Alias(alias) => alias.nullability,
+ };
+
+ is_nullable(nullability)
+}
+
+fn is_nullable(nullability: i32) -> bool {
+ match r#type::Nullability::try_from(nullability) {
+ Ok(r#type::Nullability::Required) => false,
+ Ok(r#type::Nullability::Nullable | r#type::Nullability::Unspecified) |
Err(_) => {
Review Comment:
Good idea -- done!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
