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

fix(rust): inconsistent order of partitioning columns (#2494) #2614

Merged
merged 4 commits into from
Jul 11, 2024
Merged

fix(rust): inconsistent order of partitioning columns (#2494) #2614

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca9abe5
Fix inconsistent order of partitioning columns (#2494)
aditanase Jun 20, 2024
ddb24bb
Fix formatting
aditanase Jun 20, 2024
c58733f
Merge branch 'main' into partition-cols-2494
rtyler Jun 30, 2024
4e88459
Merge branch 'main' into partition-cols-2494
rtyler Jul 11, 2024
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
47 changes: 24 additions & 23 deletions crates/core/src/delta_datafusion/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,34 +191,35 @@ impl DataFusionMixins for DeltaTableState {

fn _arrow_schema(snapshot: &Snapshot, wrap_partitions: bool) -> DeltaResult<ArrowSchemaRef> {
let meta = snapshot.metadata();
let fields = meta
.schema()?

let schema = meta.schema()?;
let fields = schema
.fields()
.filter(|f| !meta.partition_columns.contains(&f.name().to_string()))
.map(|f| f.try_into())
.chain(
meta.schema()?
.fields()
.filter(|f| meta.partition_columns.contains(&f.name().to_string()))
.map(|f| {
let field = Field::try_from(f)?;
let corrected = if wrap_partitions {
match field.data_type() {
// Only dictionary-encode types that may be large
// // https://github.com/apache/arrow-datafusion/pull/5545
DataType::Utf8
| DataType::LargeUtf8
| DataType::Binary
| DataType::LargeBinary => {
wrap_partition_type_in_dict(field.data_type().clone())
}
_ => field.data_type().clone(),
// We need stable order between logical and physical schemas, but the order of
// partitioning columns is not always the same in the json schema and the array
meta.partition_columns.iter().map(|partition_col| {
let f = schema.field(partition_col).unwrap();
let field = Field::try_from(f)?;
let corrected = if wrap_partitions {
match field.data_type() {
// Only dictionary-encode types that may be large
// // https://github.com/apache/arrow-datafusion/pull/5545
DataType::Utf8
| DataType::LargeUtf8
| DataType::Binary
| DataType::LargeBinary => {
wrap_partition_type_in_dict(field.data_type().clone())
}
} else {
field.data_type().clone()
};
Ok(field.with_data_type(corrected))
}),
_ => field.data_type().clone(),
}
} else {
field.data_type().clone()
};
Ok(field.with_data_type(corrected))
}),
)
.collect::<Result<Vec<Field>, _>>()?;

Expand Down
Loading