Skip to content

Upgrade to datafusion 38 #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 14, 2024
143 changes: 65 additions & 78 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ substrait = ["dep:datafusion-substrait"]
tokio = { version = "1.35", features = ["macros", "rt", "rt-multi-thread", "sync"] }
rand = "0.8"
pyo3 = { version = "0.20", features = ["extension-module", "abi3", "abi3-py38"] }
datafusion = { version = "37.1.0", features = ["pyarrow", "avro", "unicode_expressions"] }
datafusion-common = { version = "37.1.0", features = ["pyarrow"] }
datafusion-expr = "37.1.0"
datafusion-functions-array = "37.1.0"
datafusion-optimizer = "37.1.0"
datafusion-sql = "37.1.0"
datafusion-substrait = { version = "37.1.0", optional = true }
datafusion = { version = "38.0.0", features = ["pyarrow", "avro", "unicode_expressions"] }
datafusion-common = { version = "38.0.0", features = ["pyarrow"] }
datafusion-expr = "38.0.0"
datafusion-functions-array = "38.0.0"
datafusion-optimizer = "38.0.0"
datafusion-sql = "38.0.0"
datafusion-substrait = { version = "38.0.0", optional = true }
prost = "0.12"
prost-types = "0.12"
uuid = { version = "1.8", features = ["v4"] }
Expand Down
3 changes: 0 additions & 3 deletions datafusion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
)

from .common import (
DFField,
DFSchema,
)

Expand All @@ -64,8 +63,6 @@
IsNotFalse,
IsNotUnknown,
Negative,
ScalarFunction,
BuiltinScalarFunction,
InList,
Exists,
Subquery,
Expand Down
6 changes: 3 additions & 3 deletions datafusion/tests/test_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,9 @@ def test_describe(df):
"max",
"median",
],
"a": [3.0, 3.0, 2.0, 1.0, 1.0, 3.0, 2.0],
"b": [3.0, 3.0, 5.0, 1.0, 4.0, 6.0, 5.0],
"c": [3.0, 3.0, 7.0, 1.7320508075688772, 5.0, 8.0, 8.0],
"a": [3.0, 0.0, 2.0, 1.0, 1.0, 3.0, 2.0],
"b": [3.0, 0.0, 5.0, 1.0, 4.0, 6.0, 5.0],
"c": [3.0, 0.0, 7.0, 1.7320508075688772, 5.0, 8.0, 8.0],
Comment on lines +733 to +735
Copy link
Member

Choose a reason for hiding this comment

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

Why are these changes needed?

Copy link
Contributor Author

@Michael-J-Ward Michael-J-Ward May 13, 2024

Choose a reason for hiding this comment

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

null_count was fixed upstream in apache/datafusion#10260

The underlying data being described:

>>> print(df)
DataFrame()
+---+---+---+
| a | b | c |
+---+---+---+
| 1 | 4 | 8 |
| 2 | 5 | 5 |
| 3 | 6 | 8 |
+---+---+---+

}


Expand Down
Loading
Loading