Skip to content
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

Jump to bottom

Improve schema mismatch error message #3098

Merged
merged 6 commits into from
Nov 13, 2022
Merged

Improve schema mismatch error message #3098

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aaedbb2
Improve schema mismatch error message
Nov 13, 2022
15e4bf9
fix formatting issues
Nov 13, 2022
d0fe4e0
trivial change to trigger build
Nov 13, 2022
7a2b3b1
Merge branch 'master' of https://github.com/apache/arrow-rs into erro…
Nov 13, 2022
20bf5da
fix PR comments
Nov 13, 2022
931b05f
Empty commit
Nov 13, 2022
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
37 changes: 19 additions & 18 deletions arrow-schema/src/field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,16 @@ impl Field {
/// ```
pub fn try_merge(&mut self, from: &Field) -> Result<(), ArrowError> {
if from.dict_id != self.dict_id {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting dict_id".to_string(),
));
return Err(ArrowError::SchemaError(format!(
"Fail to merge schema field because from dict_id = {} does not match {}",
from.dict_id, self.dict_id
)));
}
if from.dict_is_ordered != self.dict_is_ordered {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting dict_is_ordered"
.to_string(),
));
return Err(ArrowError::SchemaError(format!(
"Fail to merge schema field because from dict_is_ordered = {} does not match {}",
from.dict_is_ordered, self.dict_is_ordered
)));
}
// merge metadata
match (self.metadata(), from.metadata()) {
Expand All @@ -284,7 +285,8 @@ impl Field {
if let Some(self_value) = self_metadata.get(key) {
if self_value != from_value {
return Err(ArrowError::SchemaError(format!(
"Fail to merge field due to conflicting metadata data value for key {}", key),
"Fail to merge field due to conflicting metadata data value for key {}.
From value = {} does not match {}", key, from_value, self_value),
));
}
} else {
Expand Down Expand Up @@ -313,10 +315,9 @@ impl Field {
}
_ => {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting datatype"
.to_string(),
));
}
format!("Fail to merge schema field because the from data_type = {} is not DataType::Struct",
from.data_type)
))}
},
DataType::Union(nested_fields, type_ids, _) => match &from.data_type {
DataType::Union(from_nested_fields, from_type_ids, _) => {
Expand All @@ -333,8 +334,8 @@ impl Field {
// type id.
if self_type_id != field_type_id {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting type ids in union datatype"
.to_string(),
format!("Fail to merge schema field because the self_type_id = {} does not equal field_type_id = {}",
self_type_id, field_type_id)
));
}

Expand All @@ -351,8 +352,8 @@ impl Field {
}
_ => {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting datatype"
.to_string(),
format!("Fail to merge schema field because the from data_type = {} is not DataType::Union",
from.data_type)
));
}
},
Expand Down Expand Up @@ -390,8 +391,8 @@ impl Field {
| DataType::Decimal256(_, _) => {
if self.data_type != from.data_type {
return Err(ArrowError::SchemaError(
"Fail to merge schema Field due to conflicting datatype"
.to_string(),
format!("Fail to merge schema field because the from data_type = {} does not equal {}",
from.data_type, self.data_type)
));
}
}
Expand Down