Skip to content

Commit 9661ccf

Browse files
committed
Update to DF 43.0.0
1 parent 3676b1d commit 9661ccf

File tree

4 files changed

+78
-54
lines changed

4 files changed

+78
-54
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ substrait = ["dep:datafusion-substrait"]
3737
tokio = { version = "1.39", features = ["macros", "rt", "rt-multi-thread", "sync"] }
3838
pyo3 = { version = "0.22", features = ["extension-module", "abi3", "abi3-py38"] }
3939
arrow = { version = "53", features = ["pyarrow"] }
40-
datafusion = { version = "42.0.0", features = ["pyarrow", "avro", "unicode_expressions"] }
41-
datafusion-substrait = { version = "42.0.0", optional = true }
42-
datafusion-proto = { version = "42.0.0" }
43-
datafusion-functions-window-common = { version = "42.0.0" }
40+
datafusion = { version = "43.0.0", features = ["pyarrow", "avro", "unicode_expressions"] }
41+
datafusion-substrait = { version = "43.0.0", optional = true }
42+
datafusion-proto = { version = "43.0.0" }
43+
datafusion-functions-window-common = { version = "43.0.0" }
4444
prost = "0.13" # keep in line with `datafusion-substrait`
4545
uuid = { version = "1.11", features = ["v4"] }
4646
mimalloc = { version = "0.1", optional = true, default-features = false, features = ["local_dynamic_tls"] }
@@ -49,12 +49,6 @@ futures = "0.3"
4949
object_store = { version = "0.11.0", features = ["aws", "gcp", "azure", "http"] }
5050
url = "2"
5151

52-
[patch.crates-io]
53-
datafusion = { git = "https://github.com/apache/datafusion.git", branch = "main" }
54-
datafusion-substrait = { git = "https://github.com/apache/datafusion.git", branch = "main" }
55-
datafusion-proto = { git = "https://github.com/apache/datafusion.git", branch = "main" }
56-
datafusion-functions-window-common = { git = "https://github.com/apache/datafusion.git", branch = "main" }
57-
5852
[build-dependencies]
5953
prost-types = "0.13" # keep in line with `datafusion-substrait`
6054
pyo3-build-config = "0.22"

python/tests/test_sql.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,13 @@ def test_simple_select(ctx, tmp_path, arr):
468468
batches = ctx.sql("SELECT a AS tt FROM t").collect()
469469
result = batches[0].column(0)
470470

471+
# In DF 43.0.0 we now default to having BinaryView and StringView
472+
# so the array that is saved to the parquet is slightly different
473+
# than the array read. Convert to values for comparison.
474+
if isinstance(result, pa.BinaryViewArray) or isinstance(result, pa.StringViewArray):
475+
arr = arr.tolist()
476+
result = result.tolist()
477+
471478
np.testing.assert_equal(result, arr)
472479

473480

src/sql/logical.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ impl PyLogicalPlan {
9090
| LogicalPlan::Ddl(_)
9191
| LogicalPlan::Copy(_)
9292
| LogicalPlan::DescribeTable(_)
93+
| LogicalPlan::Execute(_)
9394
| LogicalPlan::RecursiveQuery(_) => Err(py_unsupported_variant_err(format!(
9495
"Conversion of variant not implemented: {:?}",
9596
self.plan

0 commit comments

Comments
 (0)