timsaucer commented on code in PR #10075:
URL: https://github.com/apache/arrow-rs/pull/10075#discussion_r3362220744
##########
arrow-schema/src/field.rs:
##########
@@ -128,31 +127,7 @@ impl Ord for Field {
.cmp(other.name())
.then_with(|| self.data_type.cmp(other.data_type()))
.then_with(|| self.nullable.cmp(&other.nullable))
- .then_with(|| {
- // ensure deterministic key order
- let mut keys: Vec<&String> =
-
self.metadata.keys().chain(other.metadata.keys()).collect();
- keys.sort();
- for k in keys {
- match (self.metadata.get(k), other.metadata.get(k)) {
- (None, None) => {}
- (Some(_), None) => {
- return Ordering::Less;
- }
- (None, Some(_)) => {
- return Ordering::Greater;
- }
- (Some(v1), Some(v2)) => match v1.cmp(v2) {
- Ordering::Equal => {}
- other => {
- return other;
- }
- },
- }
- }
-
- Ordering::Equal
Review Comment:
Nice removal! Especially for unit tests.
##########
arrow-avro/src/reader/mod.rs:
##########
@@ -5482,34 +5482,14 @@ mod test {
#[cfg(not(feature = "avro_custom_types"))]
{
let schema = Arc::new(Schema::new(vec![
- Field::new("duration_time_nanos", DataType::Int64,
false).with_metadata(
- [(
- "logicalType".to_string(),
- "arrow.duration-nanos".to_string(),
- )]
- .into(),
- ),
- Field::new("duration_time_micros", DataType::Int64,
false).with_metadata(
- [(
- "logicalType".to_string(),
- "arrow.duration-micros".to_string(),
- )]
- .into(),
- ),
- Field::new("duration_time_millis", DataType::Int64,
false).with_metadata(
- [(
- "logicalType".to_string(),
- "arrow.duration-millis".to_string(),
- )]
- .into(),
- ),
- Field::new("duration_time_seconds", DataType::Int64,
false).with_metadata(
- [(
- "logicalType".to_string(),
- "arrow.duration-seconds".to_string(),
- )]
- .into(),
- ),
+ Field::new("duration_time_nanos", DataType::Int64, false)
+ .with_metadata([("logicalType",
"arrow.duration-nanos")]),
+ Field::new("duration_time_micros", DataType::Int64, false)
+ .with_metadata([("logicalType",
"arrow.duration-micros")]),
+ Field::new("duration_time_millis", DataType::Int64, false)
+ .with_metadata([("logicalType",
"arrow.duration-millis")]),
+ Field::new("duration_time_seconds", DataType::Int64, false)
+ .with_metadata([("logicalType",
"arrow.duration-seconds")]),
Review Comment:
This is a very nice cleanup.
--
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]
