Skip to content
Merged
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
10 changes: 0 additions & 10 deletions arrow-schema/src/field.rs
Original file line number Diff line number Diff line change
Expand Up @@ -695,13 +695,6 @@ impl Field {
/// assert!(field.is_nullable());
/// ```
pub fn try_merge(&mut self, from: &Field) -> Result<(), ArrowError> {
#[allow(deprecated)]
if from.dict_id != self.dict_id {
return Err(ArrowError::SchemaError(format!(
"Fail to merge schema field '{}' because from dict_id = {} does not match {}",
self.name, from.dict_id, self.dict_id
)));
}
if from.dict_is_ordered != self.dict_is_ordered {
return Err(ArrowError::SchemaError(format!(
"Fail to merge schema field '{}' because from dict_is_ordered = {} does not match {}",
Expand Down Expand Up @@ -840,11 +833,8 @@ impl Field {
/// * self.metadata is a superset of other.metadata
/// * all other fields are equal
pub fn contains(&self, other: &Field) -> bool {
#[allow(deprecated)]
let matching_dict_id = self.dict_id == other.dict_id;
self.name == other.name
&& self.data_type.contains(&other.data_type)
&& matching_dict_id
&& self.dict_is_ordered == other.dict_is_ordered
// self need to be nullable or both of them are not nullable
&& (self.nullable || !other.nullable)
Expand Down
Loading