Apache DataFusion SQL Query Engine
perf: Avoid needless conversion of `Metadata` to `HashMap` (#25510)
Neil Conway925d7f8ffdcb
diff --git a/datafusion/expr/src/logical_plan/builder.rs b/datafusion/expr/src/logical_plan/builder.rsindex a44505b15a..ba16116136 100644--- a/datafusion/expr/src/logical_plan/builder.rs+++ b/datafusion/expr/src/logical_plan/builder.rs@@ -1710,7 +1710,7 @@ impl ValuesFields {let name = format!("column{}", self.inner.len() + 1);let mut field = Field::new(name, data_type, nullable);if let Some(metadata) = metadata {- field.set_metadata(metadata.to_hashmap());+ field.set_metadata(metadata.into_inner());}self.inner.push(field);}diff --git a/datafusion/functions/src/core/arrow_field.rs b/datafusion/functions/src/core/arrow_field.rsindex 46b8e9872f..c6091f49fd 100644--- a/datafusion/functions/src/core/arrow_field.rs+++ b/datafusion/functions/src/core/arrow_field.rs@@ -139,10 +139,7 @@ impl ScalarUDFImpl for ArrowFieldFunc {StringBuilder::new(),);- let mut entries: Vec<_> = metadata.iter().collect();- entries.sort_by_key(|(k, _)| *k);-- for (k, v) in entries {+ for (k, v) in metadata {map_builder.keys().append_value(k);map_builder.values().append_value(v);}diff --git a/datafusion/functions/src/core/arrow_metadata.rs b/datafusion/functions/src/core/arrow_metadata.rsindex 37a2a52c19..8840e91270 100644--- a/datafusion/functions/src/core/arrow_metadata.rs+++ b/datafusion/functions/src/core/arrow_metadata.rs@@ -142,10 +142,7 @@ impl ScalarUDFImpl for ArrowMetadataFunc {StringBuilder::new(),);- let mut entries: Vec<_> = metadata.iter().collect();- entries.sort_by_key(|(k, _)| *k);-- for (k, v) in entries {+ for (k, v) in metadata {map_builder.keys().append_value(k);map_builder.values().append_value(v);}diff --git a/datafusion/sqllogictest/test_files/arrow_field.slt b/datafusion/sqllogictest/test_files/arrow_field.sltindex d33cd935bc..7c028c9703 100644--- a/datafusion/sqllogictest/test_files/arrow_field.slt+++ b/datafusion/sqllogictest/test_files/arrow_field.slt@@ -134,6 +134,12 @@ SELECT arrow_field(id)['metadata'] FROM table_with_metadata LIMIT 1----{metadata_key: the id field}+# Metadata entries are returned in key order, regardless of insertion order.+query ?+SELECT arrow_field(with_metadata(1, 'z', 'last', 'm', 'middle', 'a', 'first'))['metadata']+----+{a: first, m: middle, z: last}+# arrow_field nullability field accessquery ISELECT count(*) FROM table_with_metadata WHERE NOT arrow_field(id)['nullable']