Skip to content

More properly handle nullability of types/literals in Substrait #10640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonahgao merged 3 commits into from
May 24, 2024
Merged

More properly handle nullability of types/literals in Substrait #10640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76925d0
More properly handle nullability of types/literals in Substrait
May 23, 2024
b6ff771
Avoid cloning and creating DataFusionError
Blizzara May 24, 2024
d9a38b1
simplify Literal/ScalarValue null handling
May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 53 additions & 7 deletions datafusion/substrait/src/logical_plan/consumer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,13 @@ pub(crate) fn from_substrait_type(dt: &substrait::proto::Type) -> Result<DataTyp
),
},
r#type::Kind::List(list) => {
let inner_type =
from_substrait_type(list.r#type.as_ref().ok_or_else(|| {
substrait_datafusion_err!("List type must have inner type")
})?)?;
let field = Arc::new(Field::new_list_field(inner_type, true));
let inner_type = list.r#type.as_ref().ok_or_else(|| {
substrait_datafusion_err!("List type must have inner type")
})?;
let field = Arc::new(Field::new_list_field(
from_substrait_type(inner_type)?,
is_substrait_type_nullable(inner_type)?,
));
match list.type_variation_reference {
DEFAULT_CONTAINER_TYPE_REF => Ok(DataType::List(field)),
LARGE_CONTAINER_TYPE_REF => Ok(DataType::LargeList(field)),
Expand All @@ -1163,8 +1165,11 @@ pub(crate) fn from_substrait_type(dt: &substrait::proto::Type) -> Result<DataTyp
r#type::Kind::Struct(s) => {
let mut fields = vec![];
for (i, f) in s.types.iter().enumerate() {
let field =
Field::new(&format!("c{i}"), from_substrait_type(f)?, true);
let field = Field::new(
&format!("c{i}"),
from_substrait_type(f)?,
is_substrait_type_nullable(f)?,
);
fields.push(field);
}
Ok(DataType::Struct(fields.into()))
Expand All @@ -1175,6 +1180,47 @@ pub(crate) fn from_substrait_type(dt: &substrait::proto::Type) -> Result<DataTyp
}
}

fn is_substrait_type_nullable(dtype: &Type) -> Result<bool> {
fn is_nullable(nullability: i32) -> bool {
nullability != substrait::proto::r#type::Nullability::Required as i32
}

let nullable = match dtype
.kind
.as_ref()
.ok_or_else(|| substrait_datafusion_err!("Type must contain Kind"))?
{
r#type::Kind::Bool(val) => is_nullable(val.nullability),
r#type::Kind::I8(val) => is_nullable(val.nullability),
r#type::Kind::I16(val) => is_nullable(val.nullability),
r#type::Kind::I32(val) => is_nullable(val.nullability),
r#type::Kind::I64(val) => is_nullable(val.nullability),
r#type::Kind::Fp32(val) => is_nullable(val.nullability),
r#type::Kind::Fp64(val) => is_nullable(val.nullability),
r#type::Kind::String(val) => is_nullable(val.nullability),
r#type::Kind::Binary(val) => is_nullable(val.nullability),
r#type::Kind::Timestamp(val) => is_nullable(val.nullability),
r#type::Kind::Date(val) => is_nullable(val.nullability),
r#type::Kind::Time(val) => is_nullable(val.nullability),
r#type::Kind::IntervalYear(val) => is_nullable(val.nullability),
r#type::Kind::IntervalDay(val) => is_nullable(val.nullability),
r#type::Kind::TimestampTz(val) => is_nullable(val.nullability),
r#type::Kind::Uuid(val) => is_nullable(val.nullability),
r#type::Kind::FixedChar(val) => is_nullable(val.nullability),
r#type::Kind::Varchar(val) => is_nullable(val.nullability),
r#type::Kind::FixedBinary(val) => is_nullable(val.nullability),
r#type::Kind::Decimal(val) => is_nullable(val.nullability),
r#type::Kind::PrecisionTimestamp(val) => is_nullable(val.nullability),
r#type::Kind::PrecisionTimestampTz(val) => is_nullable(val.nullability),
r#type::Kind::Struct(val) => is_nullable(val.nullability),
r#type::Kind::List(val) => is_nullable(val.nullability),
r#type::Kind::Map(val) => is_nullable(val.nullability),
r#type::Kind::UserDefined(val) => is_nullable(val.nullability),
r#type::Kind::UserDefinedTypeReference(_) => true, // not implemented, assume nullable
};
Ok(nullable)
}

fn from_substrait_bound(
bound: &Option<Bound>,
is_lower: bool,
Expand Down
Loading