Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions datafusion/substrait/src/logical_plan/consumer/expr/literal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
// under the License.

use crate::logical_plan::consumer::SubstraitConsumer;
use crate::logical_plan::consumer::types::from_substrait_type;
use crate::logical_plan::consumer::types::{
from_substrait_type, substrait_type_to_field,
};
use crate::logical_plan::consumer::utils::{DEFAULT_TIMEZONE, next_struct_field_name};
use crate::variation_const::FLOAT_16_TYPE_NAME;
#[expect(deprecated)]
Expand Down Expand Up @@ -338,19 +340,17 @@ pub(crate) fn from_substrait_literal(
Some(v) => Ok(v),
_ => plan_err!("Missing value type for empty map"),
}?;
let key_type = from_substrait_type(consumer, key, dfs_names, name_idx)?;
let value_type = from_substrait_type(consumer, value, dfs_names, name_idx)?;
let key_field = substrait_type_to_field(consumer, key, dfs_names, name_idx)?
.with_name("key")
.with_nullable(false);
let value_field =
substrait_type_to_field(consumer, value, dfs_names, name_idx)?
.with_name("value");

// new_empty_array on a MapType creates a too empty array
// We want it to contain an empty struct array to align with an empty MapBuilder one
let entries = Field::new_struct(
"entries",
vec![
Field::new("key", key_type, false),
Field::new("value", value_type, true),
],
false,
);
let entries =
Field::new_struct("entries", vec![key_field, value_field], false);
let struct_array =
new_empty_array(entries.data_type()).as_struct().to_owned();
ScalarValue::Map(Arc::new(MapArray::new(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use datafusion::common::{
use datafusion::execution::{FunctionRegistry, SessionState};
use datafusion::logical_expr::expr::LambdaVariable;
use datafusion::logical_expr::{Expr, Extension, LogicalPlan};
use std::collections::VecDeque;
use std::collections::{HashMap, VecDeque};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might need to use the HashMap shipped by datafusion::common

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's hashbrown::HashMap under datafusion::common, not std's. Doesn't work here: Field::with_metadata/Field::metadata() are hard-typed to std::collections::HashMap<String, String>, and this value goes straight into with_metadata. Kept std's, same as union.rs:996 does for the same reason.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 That's fine, I remember there was a CI check that fires if std's hashmap was used, but if here it's justified, we can just add a clippy exception with a good comment if CI fails

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the CI is happy

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging

use std::sync::{Arc, RwLock};
use substrait::proto::expression as substrait_expression;
use substrait::proto::expression::{
Expand Down Expand Up @@ -500,6 +500,28 @@ pub trait SubstraitConsumer: Send + Sync + Sized {
)
}

/// Optional Arrow field metadata for a Substrait type.
///
/// Arrow cannot represent some Substrait types natively. A user-defined
/// "json" type, for example, becomes a plain `DataType::Utf8`, which loses
/// the fact that the values are JSON. A consumer can return metadata here
/// to keep the original type recoverable from the Arrow schema.
///
/// The consumer sees the whole [`Type`], so it can key the metadata off a
/// user-defined type, a type variation, or anything else it recognizes.
/// The metadata is attached to the Arrow [`Field`] built for this type,
/// including a type nested inside a list, map, or struct.
///
/// The default attaches nothing.
///
/// [`Field`]: datafusion::arrow::datatypes::Field
fn consume_type_metadata(
&self,
_typ: &Type,
) -> datafusion::common::Result<Option<HashMap<String, String>>> {
Ok(None)
}

fn consume_user_defined_literal(
&self,
user_defined_literal: &proto::expression::literal::UserDefined,
Expand Down
Loading