Skip to content

Commit 9e1c846

Browse files
adriangbfriendlymatthewclaude
authored
Upgrade to DataFusion 54 and arrow 58.3 (#62)
* Remove as_any from ScalarUDFImpl impls (removed in pydantic DF fork) * Upgrade to DataFusion 54 and arrow 58.3 DataFusion 54 removed `as_any` from `ScalarUDFImpl` and bumped arrow to 58.3. Bump the dependency requirements accordingly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Matthew Kim <38759997+friendlymatthew@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 92eb5a3 commit 9e1c846

18 files changed

Lines changed: 295 additions & 634 deletions

Cargo.lock

Lines changed: 287 additions & 574 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ license = "Apache-2.0"
77
authors = ["Matthew Kim <matthew@pydantic.dev>"]
88

99
[dependencies]
10-
datafusion = "53"
11-
arrow = "58.1"
12-
arrow-schema = "58.1"
13-
parquet-variant-compute = "58.1"
14-
parquet-variant-json = "58.1"
15-
parquet-variant = "58.1"
10+
datafusion = "54"
11+
arrow = "58.3"
12+
arrow-schema = "58.3"
13+
parquet-variant-compute = "58.3"
14+
parquet-variant-json = "58.3"
15+
parquet-variant = "58.3"
1616

1717
[dev-dependencies]
1818
anyhow = "1.0.100"
19-
arrow-cast = "58.1"
19+
arrow-cast = "58.3"
2020
serde_json = "1.0.145"
2121
flate2 = "1.0"
2222
tokio = { version = "1.0", features = ["rt-multi-thread", "macros"] }
23-
datafusion-sqllogictest = "53"
23+
datafusion-sqllogictest = "54"
2424
sqllogictest = "0.29"
2525
indicatif = "0.18"
2626
env_logger = "0.11"

src/cast_to_variant.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ impl CastToVariantUdf {
157157
}
158158

159159
impl ScalarUDFImpl for CastToVariantUdf {
160-
fn as_any(&self) -> &dyn std::any::Any {
161-
self
162-
}
163160

164161
fn name(&self) -> &str {
165162
"cast_to_variant"

src/impl_variant_get.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ macro_rules! impl_variant_get_typed {
2323
}
2424

2525
impl ScalarUDFImpl for $struct_name {
26-
fn as_any(&self) -> &dyn std::any::Any {
27-
self
28-
}
2926

3027
fn name(&self) -> &str {
3128
$func_name

src/is_variant_null.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ impl Default for IsVariantNullUdf {
2727
}
2828

2929
impl ScalarUDFImpl for IsVariantNullUdf {
30-
fn as_any(&self) -> &dyn std::any::Any {
31-
self
32-
}
3330

3431
fn name(&self) -> &str {
3532
"is_variant_null"

src/json_to_variant.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ impl Default for JsonToVariantUdf {
3838
}
3939

4040
impl ScalarUDFImpl for JsonToVariantUdf {
41-
fn as_any(&self) -> &dyn std::any::Any {
42-
self
43-
}
4441

4542
fn name(&self) -> &str {
4643
"json_to_variant"

src/variant_contains.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ fn variant_contains(variant: Option<&Variant<'_, '_>>, path: &VariantPath<'_>) -
3131
}
3232

3333
impl ScalarUDFImpl for VariantContainsUdf {
34-
fn as_any(&self) -> &dyn std::any::Any {
35-
self
36-
}
37-
3834
fn name(&self) -> &str {
3935
"variant_contains"
4036
}

src/variant_get.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,6 @@ impl Default for VariantGetUdf {
335335
}
336336

337337
impl ScalarUDFImpl for VariantGetUdf {
338-
fn as_any(&self) -> &dyn std::any::Any {
339-
self
340-
}
341338

342339
fn name(&self) -> &str {
343340
"variant_get"
@@ -392,9 +389,6 @@ impl Default for VariantGetFieldUdf {
392389
}
393390

394391
impl ScalarUDFImpl for VariantGetFieldUdf {
395-
fn as_any(&self) -> &dyn std::any::Any {
396-
self
397-
}
398392

399393
fn name(&self) -> &str {
400394
"variant_get_field"

src/variant_list_construct.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ impl Default for VariantListConstruct {
2828
}
2929

3030
impl ScalarUDFImpl for VariantListConstruct {
31-
fn as_any(&self) -> &dyn std::any::Any {
32-
self
33-
}
3431

3532
fn name(&self) -> &str {
3633
"variant_list_construct"

src/variant_list_delete.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ fn delete_list_element(variant_list: Variant, index: usize) -> Result<(Vec<u8>,
6767
}
6868

6969
impl ScalarUDFImpl for VariantListDelete {
70-
fn as_any(&self) -> &dyn std::any::Any {
71-
self
72-
}
7370

7471
fn name(&self) -> &str {
7572
"variant_list_delete"

0 commit comments

Comments
 (0)