Skip to content

Conversation

@alamb
Copy link
Contributor

@alamb alamb commented Feb 25, 2025

Description

Note this PR should have no functional change

This is part of the DataFusion upgrade in #3262, which I am trying to split into multiple parts to reduce the size of the diff (so to make it easier to review and debug)

DataFusion 46.0.0 adds a new field, Column::spans which requires changing all locations that create Column either to have a span in it or to use the constructor. So let's change the code to use the constructor here

Related Issue(s)

Documentation

@github-actions github-actions bot added the binding/rust Issues for the Rust crate label Feb 25, 2025
@alamb alamb marked this pull request as ready for review February 25, 2025 17:33
);
let filter = col(Column::new(Some(target_name.clone()), "id"))
.between(lit("B"), lit("C"))
.and(lit("2023-07-04").eq(col(Column::new(Some(target_name.clone()), "modified"))));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I was working on this, I also updated uses of patterns like Expr::Literal(ScalarValue::Utf8(Some("B".to_string()))), to lit("B") as it does the same thing and is more concise

@alamb alamb marked this pull request as draft February 25, 2025 17:34
@alamb alamb force-pushed the alamb/prepare_upgrade_46 branch from f3bf6ca to 49227fb Compare February 25, 2025 17:57
@alamb alamb marked this pull request as ready for review February 25, 2025 17:58
.build()
.unwrap();

let join_predicate = col(Column {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the key rationale for this change is that Column has a new field in DataFUsion 46, so if it is constructed explicitly like this I need to change all the callsites

If I switch to using Column::new() then nothing needs to be changed as part of the upgrade (as Column::new handles initializing the newly added field)

@ion-elgreco ion-elgreco force-pushed the alamb/prepare_upgrade_46 branch from 49227fb to bd0ec41 Compare February 25, 2025 18:13
@codecov
Copy link

codecov bot commented Feb 25, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.05%. Comparing base (4be81fb) to head (bd0ec41).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3265      +/-   ##
==========================================
- Coverage   72.14%   72.05%   -0.09%     
==========================================
  Files         143      143              
  Lines       45724    45606     -118     
  Branches    45724    45606     -118     
==========================================
- Hits        32986    32860     -126     
+ Misses      10666    10665       -1     
- Partials     2072     2081       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ion-elgreco ion-elgreco added this pull request to the merge queue Feb 25, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 25, 2025
@ion-elgreco ion-elgreco added this pull request to the merge queue Feb 25, 2025
Merged via the queue into delta-io:main with commit f68b994 Feb 25, 2025
25 checks passed
@alamb alamb deleted the alamb/prepare_upgrade_46 branch February 25, 2025 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

binding/rust Issues for the Rust crate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants