Skip to content

Commit

Permalink
Update to DF 43.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
timsaucer committed Nov 9, 2024
1 parent 3676b1d commit 9661ccf
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 54 deletions.
110 changes: 66 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ substrait = ["dep:datafusion-substrait"]
tokio = { version = "1.39", features = ["macros", "rt", "rt-multi-thread", "sync"] }
pyo3 = { version = "0.22", features = ["extension-module", "abi3", "abi3-py38"] }
arrow = { version = "53", features = ["pyarrow"] }
datafusion = { version = "42.0.0", features = ["pyarrow", "avro", "unicode_expressions"] }
datafusion-substrait = { version = "42.0.0", optional = true }
datafusion-proto = { version = "42.0.0" }
datafusion-functions-window-common = { version = "42.0.0" }
datafusion = { version = "43.0.0", features = ["pyarrow", "avro", "unicode_expressions"] }
datafusion-substrait = { version = "43.0.0", optional = true }
datafusion-proto = { version = "43.0.0" }
datafusion-functions-window-common = { version = "43.0.0" }
prost = "0.13" # keep in line with `datafusion-substrait`
uuid = { version = "1.11", features = ["v4"] }
mimalloc = { version = "0.1", optional = true, default-features = false, features = ["local_dynamic_tls"] }
Expand All @@ -49,12 +49,6 @@ futures = "0.3"
object_store = { version = "0.11.0", features = ["aws", "gcp", "azure", "http"] }
url = "2"

[patch.crates-io]
datafusion = { git = "https://github.com/apache/datafusion.git", branch = "main" }
datafusion-substrait = { git = "https://github.com/apache/datafusion.git", branch = "main" }
datafusion-proto = { git = "https://github.com/apache/datafusion.git", branch = "main" }
datafusion-functions-window-common = { git = "https://github.com/apache/datafusion.git", branch = "main" }

[build-dependencies]
prost-types = "0.13" # keep in line with `datafusion-substrait`
pyo3-build-config = "0.22"
Expand Down
7 changes: 7 additions & 0 deletions python/tests/test_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,13 @@ def test_simple_select(ctx, tmp_path, arr):
batches = ctx.sql("SELECT a AS tt FROM t").collect()
result = batches[0].column(0)

# In DF 43.0.0 we now default to having BinaryView and StringView
# so the array that is saved to the parquet is slightly different
# than the array read. Convert to values for comparison.
if isinstance(result, pa.BinaryViewArray) or isinstance(result, pa.StringViewArray):
arr = arr.tolist()
result = result.tolist()

np.testing.assert_equal(result, arr)


Expand Down
1 change: 1 addition & 0 deletions src/sql/logical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ impl PyLogicalPlan {
| LogicalPlan::Ddl(_)
| LogicalPlan::Copy(_)
| LogicalPlan::DescribeTable(_)
| LogicalPlan::Execute(_)
| LogicalPlan::RecursiveQuery(_) => Err(py_unsupported_variant_err(format!(
"Conversion of variant not implemented: {:?}",
self.plan
Expand Down

0 comments on commit 9661ccf

Please sign in to comment.