Skip to content

Commit f1f7ad8

Browse files
authored
Upgrade DF51.0.0 (#104)
* Upgrade DF51.0.0 * udpate
1 parent ec7e88a commit f1f7ad8

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ rust-version = "1.85.1"
2929

3030
[dependencies]
3131
aquamarine = "0.6.0"
32-
arrow = "56.0.0"
33-
arrow-schema = "56.0.0"
32+
arrow = "57.0.0"
33+
arrow-schema = "57.0.0"
3434
async-trait = "0.1.89"
3535
dashmap = "6"
36-
datafusion = "50"
37-
datafusion-common = "50"
38-
datafusion-expr = "50"
39-
datafusion-functions = "50"
40-
datafusion-functions-aggregate = "50"
41-
datafusion-optimizer = "50"
42-
datafusion-physical-expr = "50"
43-
datafusion-physical-plan = "50"
44-
datafusion-sql = "50"
36+
datafusion = "51"
37+
datafusion-common = "51"
38+
datafusion-expr = "51"
39+
datafusion-functions = "51"
40+
datafusion-functions-aggregate = "51"
41+
datafusion-optimizer = "51"
42+
datafusion-physical-expr = "51"
43+
datafusion-physical-plan = "51"
44+
datafusion-sql = "51"
4545
futures = "0.3"
4646
itertools = "0.14"
4747
log = "0.4"

src/rewrite/normal_form.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ mod test {
10991099
assert_eq!(rewritten.schema().as_ref(), query_plan.schema().as_ref());
11001100

11011101
let expected = concat_batches(
1102-
&query_plan.schema().as_ref().clone().into(),
1102+
&query_plan.schema().inner().clone(),
11031103
&context
11041104
.execute_logical_plan(query_plan)
11051105
.await?
@@ -1108,7 +1108,7 @@ mod test {
11081108
)?;
11091109

11101110
let result = concat_batches(
1111-
&rewritten.schema().as_ref().clone().into(),
1111+
&rewritten.schema().inner().clone(),
11121112
&context
11131113
.execute_logical_plan(rewritten)
11141114
.await?

tests/materialized_listing_table.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ use datafusion::{
3232
},
3333
prelude::{SessionConfig, SessionContext},
3434
};
35-
use datafusion_common::{Constraints, DataFusionError, ParamValues, ScalarValue, Statistics};
35+
use datafusion_common::{
36+
metadata::ScalarAndMetadata, Constraints, DataFusionError, ParamValues, ScalarValue, Statistics,
37+
};
3638
use datafusion_expr::{
3739
col, dml::InsertOp, Expr, JoinType, LogicalPlan, LogicalPlanBuilder, SortExpr,
3840
TableProviderFilterPushDown, TableType,
@@ -550,7 +552,7 @@ impl TableProvider for MaterializedListingTable {
550552
fn parse_partition_values(
551553
path: &ObjectPath,
552554
partition_columns: &[(String, DataType)],
553-
) -> Result<Vec<ScalarValue>, DataFusionError> {
555+
) -> Result<Vec<ScalarAndMetadata>, DataFusionError> {
554556
let parts = path.parts().map(|part| part.to_owned()).collect::<Vec<_>>();
555557

556558
let pairs = parts
@@ -562,7 +564,7 @@ fn parse_partition_values(
562564
.iter()
563565
.map(|(column, datatype)| {
564566
let value = pairs.get(column.as_str()).copied().map(String::from);
565-
ScalarValue::Utf8(value).cast_to(datatype)
567+
ScalarAndMetadata::from(ScalarValue::Utf8(value)).cast_storage_to(datatype)
566568
})
567569
.collect::<Result<Vec<_>, _>>()?;
568570

0 commit comments

Comments
 (0)