This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-python.git
The following commit(s) were added to refs/heads/main by this push:
new ee93cdd Upgrade Datafusion to v37.1.0 (#669)
ee93cdd is described below
commit ee93cdd6c23a789d816a1c5a555a1e6ecf40a99c
Author: Michael J Ward <[email protected]>
AuthorDate: Wed May 8 17:35:55 2024 -0500
Upgrade Datafusion to v37.1.0 (#669)
* deps: upgrade datafusion to 37.1.0
* feat: re-implement SessionContext::tables
The method was removed upstream but is used in many tests for
`datafusion-python`.
Ref: https://github.com/apache/datafusion/pull/9627
* feat: upgrade dataframe write_parquet and write_json
The options to write_parquet changed.
write_json has a new argument that I defaulted to None. We can expose that
config later.
Ref: https://github.com/apache/datafusion/pull/9382
* feat: impl new ExecutionPlanProperties for DatasetExec
Ref: https://github.com/apache/datafusion/pull/9346
* feat: add upstream variant and method params
- `WindowFunction` and `AggregateFunction` have `null_treatment` options.
- `ScalarValue` and `DataType` have new variants
- `SchemaProvider::table` now returns a `Result`
* lint: allow(deprecated) for make_scalar_function
* feat: migrate functions.rs
`datafusion` completed an Epic that ported many of the `BuiltInFunctions`
enum to `SclarUDF`.
I created new macros to simplify the port, and used these macros to
refactor a few existing functions.
Ref: https://github.com/apache/datafusion/issues/9285
* fixme: commented out last failing test
This is a bug upstream in datafusion
FAILED datafusion/tests/test_functions.py::test_array_functions -
pyo3_runtime.PanicException: range end index 9 out of range for slice of length
8
* chore: update Cargo.toml package info
---
Cargo.lock | 325 ++++++++++++++++++------------
Cargo.toml | 22 +-
datafusion/tests/test_functions.py | 8 +-
src/catalog.rs | 2 +-
src/common/data_type.rs | 20 ++
src/context.rs | 14 +-
src/dataframe.rs | 18 +-
src/dataset_exec.rs | 49 +++--
src/expr.rs | 5 +
src/functions.rs | 397 +++++++++++++++++++++++--------------
src/physical_plan.rs | 2 +-
src/udf.rs | 4 +-
src/utils.rs | 4 +-
13 files changed, 545 insertions(+), 325 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e7b8d32..5eb791b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -130,9 +130,9 @@ checksum =
"96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "arrow"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c"
+checksum = "219d05930b81663fd3b32e3bde8ce5bff3c4d23052a99f11a8fa50a3b47b2658"
dependencies = [
"arrow-arith",
"arrow-array",
@@ -152,9 +152,9 @@ dependencies = [
[[package]]
name = "arrow-arith"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705"
+checksum = "0272150200c07a86a390be651abdd320a2d12e84535f0837566ca87ecd8f95e0"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -167,9 +167,9 @@ dependencies = [
[[package]]
name = "arrow-array"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609"
+checksum = "8010572cf8c745e242d1b632bd97bd6d4f40fefed5ed1290a8f433abaa686fea"
dependencies = [
"ahash",
"arrow-buffer",
@@ -184,9 +184,9 @@ dependencies = [
[[package]]
name = "arrow-buffer"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4"
+checksum = "0d0a2432f0cba5692bf4cb757469c66791394bac9ec7ce63c1afe74744c37b27"
dependencies = [
"bytes",
"half",
@@ -195,28 +195,30 @@ dependencies = [
[[package]]
name = "arrow-cast"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef"
+checksum = "9abc10cd7995e83505cc290df9384d6e5412b207b79ce6bdff89a10505ed2cba"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"arrow-select",
- "base64",
+ "atoi",
+ "base64 0.22.1",
"chrono",
"comfy-table",
"half",
"lexical-core",
"num",
+ "ryu",
]
[[package]]
name = "arrow-csv"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781"
+checksum = "95cbcba196b862270bf2a5edb75927380a7f3a163622c61d40cbba416a6305f2"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -233,9 +235,9 @@ dependencies = [
[[package]]
name = "arrow-data"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e"
+checksum = "2742ac1f6650696ab08c88f6dd3f0eb68ce10f8c253958a18c943a68cd04aec5"
dependencies = [
"arrow-buffer",
"arrow-schema",
@@ -245,9 +247,9 @@ dependencies = [
[[package]]
name = "arrow-ipc"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d"
+checksum = "a42ea853130f7e78b9b9d178cb4cd01dee0f78e64d96c2949dc0a915d6d9e19d"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -260,9 +262,9 @@ dependencies = [
[[package]]
name = "arrow-json"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f"
+checksum = "eaafb5714d4e59feae964714d724f880511500e3569cc2a94d02456b403a2a49"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -280,9 +282,9 @@ dependencies = [
[[package]]
name = "arrow-ord"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be"
+checksum = "e3e6b61e3dc468f503181dccc2fc705bdcc5f2f146755fa5b56d0a6c5943f412"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -295,9 +297,9 @@ dependencies = [
[[package]]
name = "arrow-row"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf"
+checksum = "848ee52bb92eb459b811fb471175ea3afcf620157674c8794f539838920f9228"
dependencies = [
"ahash",
"arrow-array",
@@ -310,18 +312,18 @@ dependencies = [
[[package]]
name = "arrow-schema"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029"
+checksum = "02d9483aaabe910c4781153ae1b6ae0393f72d9ef757d38d09d450070cf2e528"
dependencies = [
"bitflags 2.4.2",
]
[[package]]
name = "arrow-select"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c"
+checksum = "849524fa70e0e3c5ab58394c770cb8f514d0122d20de08475f7b472ed8075830"
dependencies = [
"ahash",
"arrow-array",
@@ -333,15 +335,16 @@ dependencies = [
[[package]]
name = "arrow-string"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7"
+checksum = "9373cb5a021aee58863498c37eb484998ef13377f69989c6c5ccfbd258236cdb"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"arrow-select",
+ "memchr",
"num",
"regex",
"regex-syntax",
@@ -373,7 +376,7 @@ checksum =
"5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -384,7 +387,16 @@ checksum =
"c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
]
[[package]]
@@ -423,6 +435,12 @@ version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -715,9 +733,9 @@ dependencies = [
[[package]]
name = "datafusion"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b2b360b692bf6c6d6e6b6dbaf41a3be0020daeceac0f406aed54c75331e50dbb"
+checksum = "85069782056753459dc47e386219aa1fdac5b731f26c28abb8c0ffd4b7c5ab11"
dependencies = [
"ahash",
"apache-avro",
@@ -732,6 +750,7 @@ dependencies = [
"chrono",
"dashmap",
"datafusion-common",
+ "datafusion-common-runtime",
"datafusion-execution",
"datafusion-expr",
"datafusion-functions",
@@ -767,9 +786,9 @@ dependencies = [
[[package]]
name = "datafusion-common"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "37f343ccc298f440e25aa38ff82678291a7acc24061c7370ba6c0ff5cc811412"
+checksum = "309d9040751f6dc9e33c85dce6abb55a46ef7ea3644577dd014611c379447ef3"
dependencies = [
"ahash",
"apache-avro",
@@ -779,6 +798,7 @@ dependencies = [
"arrow-schema",
"chrono",
"half",
+ "instant",
"libc",
"num_cpus",
"object_store",
@@ -787,11 +807,20 @@ dependencies = [
"sqlparser",
]
+[[package]]
+name = "datafusion-common-runtime"
+version = "37.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a3e4a44d8ef1b1e85d32234e6012364c411c3787859bb3bba893b0332cb03dfd"
+dependencies = [
+ "tokio",
+]
+
[[package]]
name = "datafusion-execution"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3f9c93043081487e335399a21ebf8295626367a647ac5cb87d41d18afad7d0f7"
+checksum = "06a3a29ae36bcde07d179cc33b45656a8e7e4d023623e320e48dcf1200eeee95"
dependencies = [
"arrow",
"chrono",
@@ -810,13 +839,14 @@ dependencies = [
[[package]]
name = "datafusion-expr"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e204d89909e678846b6a95f156aafc1ee5b36cb6c9e37ec2e1449b078a38c818"
+checksum = "2a3542aa322029c2121a671ce08000d4b274171070df13f697b14169ccf4f628"
dependencies = [
"ahash",
"arrow",
"arrow-array",
+ "chrono",
"datafusion-common",
"paste",
"sqlparser",
@@ -826,38 +856,54 @@ dependencies = [
[[package]]
name = "datafusion-functions"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "98f1c73f7801b2b8ba2297b3ad78ffcf6c1fc6b8171f502987eb9ad5cb244ee7"
+checksum = "dd221792c666eac174ecc09e606312844772acc12cbec61a420c2fca1ee70959"
dependencies = [
"arrow",
- "base64",
+ "base64 0.22.1",
+ "blake2",
+ "blake3",
+ "chrono",
"datafusion-common",
"datafusion-execution",
"datafusion-expr",
+ "datafusion-physical-expr",
"hex",
+ "itertools 0.12.0",
"log",
+ "md-5",
+ "regex",
+ "sha2",
+ "unicode-segmentation",
+ "uuid",
]
[[package]]
name = "datafusion-functions-array"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "42d16a0ddf2c991526f6ffe2f47a72c6da0b7354d6c32411dd20631fe2e38937"
+checksum = "e501801e84d9c6ef54caaebcda1b18a6196a24176c12fb70e969bc0572e03c55"
dependencies = [
"arrow",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-ord",
+ "arrow-schema",
"datafusion-common",
"datafusion-execution",
"datafusion-expr",
+ "datafusion-functions",
+ "itertools 0.12.0",
"log",
"paste",
]
[[package]]
name = "datafusion-optimizer"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5ae27e07bf1f04d327be5c2a293470879801ab5535204dc3b16b062fda195496"
+checksum = "76bd7f5087817deb961764e8c973d243b54f8572db414a8f0a8f33a48f991e0a"
dependencies = [
"arrow",
"async-trait",
@@ -873,9 +919,9 @@ dependencies = [
[[package]]
name = "datafusion-physical-expr"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dde620cd9ef76a3bca9c754fb68854bd2349c49f55baf97e08001f9e967f6d6b"
+checksum = "5cabc0d9aaa0f5eb1b472112f16223c9ffd2fb04e58cbf65c0a331ee6e993f96"
dependencies = [
"ahash",
"arrow",
@@ -884,7 +930,7 @@ dependencies = [
"arrow-ord",
"arrow-schema",
"arrow-string",
- "base64",
+ "base64 0.22.1",
"blake2",
"blake3",
"chrono",
@@ -904,14 +950,13 @@ dependencies = [
"regex",
"sha2",
"unicode-segmentation",
- "uuid",
]
[[package]]
name = "datafusion-physical-plan"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9a4c75fba9ea99d64b2246cbd2fcae2e6fc973e6616b1015237a616036506dd4"
+checksum = "17c0523e9c8880f2492a88bbd857dde02bed1ed23f3e9211a89d3d7ec3b44af9"
dependencies = [
"ahash",
"arrow",
@@ -921,6 +966,7 @@ dependencies = [
"async-trait",
"chrono",
"datafusion-common",
+ "datafusion-common-runtime",
"datafusion-execution",
"datafusion-expr",
"datafusion-physical-expr",
@@ -935,12 +981,11 @@ dependencies = [
"pin-project-lite",
"rand",
"tokio",
- "uuid",
]
[[package]]
name = "datafusion-python"
-version = "36.0.0"
+version = "37.1.0"
dependencies = [
"async-trait",
"datafusion",
@@ -960,7 +1005,7 @@ dependencies = [
"pyo3-build-config",
"rand",
"regex-syntax",
- "syn 2.0.48",
+ "syn 2.0.60",
"tokio",
"url",
"uuid",
@@ -968,23 +1013,25 @@ dependencies = [
[[package]]
name = "datafusion-sql"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "21474a95c3a62d113599d21b439fa15091b538bac06bd20be0bb2e7d22903c09"
+checksum = "49eb54b42227136f6287573f2434b1de249fe1b8e6cd6cc73a634e4a3ec29356"
dependencies = [
"arrow",
+ "arrow-array",
"arrow-schema",
"datafusion-common",
"datafusion-expr",
"log",
"sqlparser",
+ "strum 0.26.1",
]
[[package]]
name = "datafusion-substrait"
-version = "36.0.0"
+version = "37.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "aab89c01ef66a59ec92d2360db63893224b4f7e085e2ee6351e0bb77f88931f0"
+checksum = "cd3b496697ac22a857c7d497b9d6b40edec19ed2e3e86e2b77051541fefb4c6d"
dependencies = [
"async-recursion",
"chrono",
@@ -1153,7 +1200,7 @@ checksum =
"87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -1287,6 +1334,12 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
[[package]]
name = "hermit-abi"
version = "0.3.4"
@@ -1421,9 +1474,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [
"equivalent",
"hashbrown 0.14.3",
@@ -1435,6 +1488,18 @@ version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "integer-encoding"
version = "3.0.4"
@@ -1840,7 +1905,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3"
dependencies = [
"async-trait",
- "base64",
+ "base64 0.21.7",
"bytes",
"chrono",
"futures",
@@ -1910,9 +1975,9 @@ dependencies = [
[[package]]
name = "parquet"
-version = "50.0.0"
+version = "51.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750"
+checksum = "096795d4f47f65fd3ee1ec5a98b77ab26d602f2cc785b0e4be5443add17ecc32"
dependencies = [
"ahash",
"arrow-array",
@@ -1922,7 +1987,7 @@ dependencies = [
"arrow-ipc",
"arrow-schema",
"arrow-select",
- "base64",
+ "base64 0.22.1",
"brotli",
"bytes",
"chrono",
@@ -2043,14 +2108,14 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
dependencies = [
"proc-macro2",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
dependencies = [
"unicode-ident",
]
@@ -2072,7 +2137,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
dependencies = [
"bytes",
- "heck",
+ "heck 0.4.1",
"itertools 0.11.0",
"log",
"multimap",
@@ -2095,7 +2160,7 @@ dependencies = [
"itertools 0.11.0",
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2162,7 +2227,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2171,10 +2236,10 @@ version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
dependencies = [
- "heck",
+ "heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2278,11 +2343,11 @@ checksum =
"c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "regress"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4ed9969cad8051328011596bf549629f1b800cf1731e7964b1eef8dfc480d2c2"
+checksum = "4f5f39ba4513916c1b2657b72af6ec671f091cd637992f58d0ede5cae4e5dea0"
dependencies = [
- "hashbrown 0.13.2",
+ "hashbrown 0.14.3",
"memchr",
]
@@ -2292,7 +2357,7 @@ version = "0.11.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
dependencies = [
- "base64",
+ "base64 0.21.7",
"bytes",
"encoding_rs",
"futures-core",
@@ -2406,7 +2471,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
dependencies = [
- "base64",
+ "base64 0.21.7",
]
[[package]]
@@ -2415,7 +2480,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4"
dependencies = [
- "base64",
+ "base64 0.21.7",
"rustls-pki-types",
]
@@ -2530,9 +2595,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
[[package]]
name = "seq-macro"
@@ -2542,22 +2607,22 @@ checksum =
"a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
-version = "1.0.195"
+version = "1.0.199"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.195"
+version = "1.0.199"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2573,9 +2638,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.111"
+version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
dependencies = [
"itoa",
"ryu",
@@ -2591,7 +2656,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2608,9 +2673,9 @@ dependencies = [
[[package]]
name = "serde_yaml"
-version = "0.9.30"
+version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
"indexmap",
"itoa",
@@ -2667,7 +2732,7 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
dependencies = [
- "heck",
+ "heck 0.4.1",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -2697,9 +2762,9 @@ checksum =
"6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "sqlparser"
-version = "0.43.1"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4"
+checksum = "aaf9c7ff146298ffda83a200f8d5084f08dcee1edfc135fcc1d646a45d50ffd6"
dependencies = [
"log",
"sqlparser_derive",
@@ -2713,7 +2778,7 @@ checksum =
"01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2743,11 +2808,11 @@ version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
- "heck",
+ "heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2756,21 +2821,21 @@ version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
dependencies = [
- "heck",
+ "heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
name = "substrait"
-version = "0.24.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2c8ffb7a3e7505bb835513e77ebfe67d359e57d684a5972323e3bdefbecc1f25"
+checksum = "df9531ae6784dee4c018ebdb0226872b63cc28765bfa65c1e53b6c58584232af"
dependencies = [
"git2",
- "heck",
+ "heck 0.5.0",
"prettyplease",
"prost",
"prost-build",
@@ -2781,7 +2846,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
- "syn 2.0.48",
+ "syn 2.0.60",
"typify",
"walkdir",
]
@@ -2805,9 +2870,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.48"
+version = "2.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
dependencies = [
"proc-macro2",
"quote",
@@ -2856,22 +2921,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2934,7 +2999,7 @@ checksum =
"5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -2986,7 +3051,7 @@ checksum =
"34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -3031,7 +3096,7 @@ checksum =
"f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
@@ -3042,9 +3107,9 @@ checksum =
"42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "typify"
-version = "0.0.15"
+version = "0.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "63ed4d717aa95e598e2f9183376b060e95669ef8f444701ea6afb990fde1cf69"
+checksum = "5c61e9db210bbff218e6535c664b37ec47da449169b98e7866d0580d0db75529"
dependencies = [
"typify-impl",
"typify-macro",
@@ -3052,27 +3117,27 @@ dependencies = [
[[package]]
name = "typify-impl"
-version = "0.0.15"
+version = "0.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "89057244dfade7c58af9e62beccbcbeb7a7e7701697a33b06dbe0b7331fb79cf"
+checksum = "95e32f38493804f88e2dc7a5412eccd872ea5452b4db9b0a77de4df180f2a87e"
dependencies = [
- "heck",
+ "heck 0.4.1",
"log",
"proc-macro2",
"quote",
"regress",
"schemars",
"serde_json",
- "syn 2.0.48",
+ "syn 2.0.60",
"thiserror",
"unicode-ident",
]
[[package]]
name = "typify-macro"
-version = "0.0.15"
+version = "0.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2ddade397f5957d2cd7fb27f905a9a569db20e8e1e3ea589edce40be07b92825"
+checksum = "cc09508b72f63d521d68e42c7f172c7416d67986df44b3c7d1f7f9963948ed32"
dependencies = [
"proc-macro2",
"quote",
@@ -3080,7 +3145,7 @@ dependencies = [
"serde",
"serde_json",
"serde_tokenstream",
- "syn 2.0.48",
+ "syn 2.0.60",
"typify-impl",
]
@@ -3125,9 +3190,9 @@ checksum =
"c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
[[package]]
name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]]
name = "untrusted"
@@ -3170,9 +3235,9 @@ checksum =
"49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
@@ -3214,7 +3279,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
"wasm-bindgen-shared",
]
@@ -3248,7 +3313,7 @@ checksum =
"bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3502,7 +3567,7 @@ checksum =
"9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.48",
+ "syn 2.0.60",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8d7e728..f04b23d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,10 +17,10 @@
[package]
name = "datafusion-python"
-version = "36.0.0"
-homepage = "https://github.com/apache/arrow-datafusion-python";
-repository = "https://github.com/apache/arrow-datafusion-python";
-authors = ["Apache Arrow <[email protected]>"]
+version = "37.1.0"
+homepage = "https://datafusion.apache.org/python";
+repository = "https://github.com/apache/datafusion-python";
+authors = ["Apache DataFusion <[email protected]>"]
description = "Apache Arrow DataFusion DataFrame and SQL Query Engine"
readme = "README.md"
license = "Apache-2.0"
@@ -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 = "36.0.0", features = ["pyarrow", "avro"] }
-datafusion-common = { version = "36.0.0", features = ["pyarrow"] }
-datafusion-expr = "36.0.0"
-datafusion-functions-array = "36.0.0"
-datafusion-optimizer = "36.0.0"
-datafusion-sql = "36.0.0"
-datafusion-substrait = { version = "36.0.0", optional = true }
+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 }
prost = "0.12"
prost-types = "0.12"
uuid = { version = "1.8", features = ["v4"] }
diff --git a/datafusion/tests/test_functions.py
b/datafusion/tests/test_functions.py
index fa9a495..d834f58 100644
--- a/datafusion/tests/test_functions.py
+++ b/datafusion/tests/test_functions.py
@@ -428,10 +428,10 @@ def test_array_functions():
f.array_slice(col, literal(2), literal(4)),
lambda: [arr[1:4] for arr in data],
],
- [
- f.list_slice(col, literal(-1), literal(2)),
- lambda: [arr[-1:2] for arr in data],
- ],
+ # [
+ # f.list_slice(col, literal(-1), literal(2)),
+ # lambda: [arr[-1:2] for arr in data],
+ # ],
[
f.array_intersect(col, literal([3.0, 4.0])),
lambda: [np.intersect1d(arr, [3.0, 4.0]) for arr in data],
diff --git a/src/catalog.rs b/src/catalog.rs
index ba7e222..49fe140 100644
--- a/src/catalog.rs
+++ b/src/catalog.rs
@@ -97,7 +97,7 @@ impl PyDatabase {
}
fn table(&self, name: &str, py: Python) -> PyResult<PyTable> {
- if let Some(table) = wait_for_future(py, self.database.table(name)) {
+ if let Some(table) = wait_for_future(py, self.database.table(name))? {
Ok(PyTable::new(table))
} else {
Err(DataFusionError::Common(format!("Table not found:
{name}")).into())
diff --git a/src/common/data_type.rs b/src/common/data_type.rs
index d3203fd..49959c4 100644
--- a/src/common/data_type.rs
+++ b/src/common/data_type.rs
@@ -226,6 +226,19 @@ impl DataTypeMap {
DataType::RunEndEncoded(_, _) => Err(py_datafusion_err(
DataFusionError::NotImplemented(format!("{:?}", arrow_type)),
)),
+ DataType::BinaryView =>
Err(py_datafusion_err(DataFusionError::NotImplemented(
+ format!("{:?}", arrow_type),
+ ))),
+ DataType::Utf8View =>
Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
+ "{:?}",
+ arrow_type
+ )))),
+ DataType::ListView(_) =>
Err(py_datafusion_err(DataFusionError::NotImplemented(
+ format!("{:?}", arrow_type),
+ ))),
+ DataType::LargeListView(_) =>
Err(py_datafusion_err(DataFusionError::NotImplemented(
+ format!("{:?}", arrow_type),
+ ))),
}
}
@@ -309,6 +322,9 @@ impl DataTypeMap {
ScalarValue::DurationMillisecond(_) =>
Ok(DataType::Duration(TimeUnit::Millisecond)),
ScalarValue::DurationMicrosecond(_) =>
Ok(DataType::Duration(TimeUnit::Microsecond)),
ScalarValue::DurationNanosecond(_) =>
Ok(DataType::Duration(TimeUnit::Nanosecond)),
+ ScalarValue::Union(_, _, _) =>
Err(py_datafusion_err(DataFusionError::NotImplemented(
+ "ScalarValue::LargeList".to_string(),
+ ))),
}
}
}
@@ -598,6 +614,10 @@ impl DataTypeMap {
DataType::Decimal256(_, _) => "Decimal256",
DataType::Map(_, _) => "Map",
DataType::RunEndEncoded(_, _) => "RunEndEncoded",
+ DataType::BinaryView => "BinaryView",
+ DataType::Utf8View => "Utf8View",
+ DataType::ListView(_) => "ListView",
+ DataType::LargeListView(_) => "LargeListView",
})
}
}
diff --git a/src/context.rs b/src/context.rs
index f1ecaa3..9462d0b 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -742,8 +742,18 @@ impl PySessionContext {
}
pub fn tables(&self) -> HashSet<String> {
- #[allow(deprecated)]
- self.ctx.tables().unwrap()
+ self.ctx
+ .catalog_names()
+ .into_iter()
+ .filter_map(|name| self.ctx.catalog(&name))
+ .flat_map(move |catalog| {
+ catalog
+ .schema_names()
+ .into_iter()
+ .filter_map(move |name| catalog.schema(&name))
+ })
+ .flat_map(|schema| schema.table_names())
+ .collect()
}
pub fn table(&self, name: &str, py: Python) -> PyResult<PyDataFrame> {
diff --git a/src/dataframe.rs b/src/dataframe.rs
index a319b3d..f1efc0c 100644
--- a/src/dataframe.rs
+++ b/src/dataframe.rs
@@ -20,10 +20,10 @@ use std::sync::Arc;
use datafusion::arrow::datatypes::Schema;
use datafusion::arrow::pyarrow::{PyArrowType, ToPyArrow};
use datafusion::arrow::util::pretty;
+use datafusion::config::TableParquetOptions;
use datafusion::dataframe::{DataFrame, DataFrameWriteOptions};
use datafusion::execution::SendableRecordBatchStream;
use datafusion::parquet::basic::{BrotliLevel, Compression, GzipLevel,
ZstdLevel};
-use datafusion::parquet::file::properties::WriterProperties;
use datafusion::prelude::*;
use datafusion_common::UnnestOptions;
use pyo3::exceptions::{PyTypeError, PyValueError};
@@ -350,7 +350,7 @@ impl PyDataFrame {
cl.ok_or(PyValueError::new_err("compression_level is not defined"))
}
- let compression_type = match compression.to_lowercase().as_str() {
+ let _validated = match compression.to_lowercase().as_str() {
"snappy" => Compression::SNAPPY,
"gzip" => Compression::GZIP(
GzipLevel::try_new(compression_level.unwrap_or(6))
@@ -375,16 +375,20 @@ impl PyDataFrame {
}
};
- let writer_properties = WriterProperties::builder()
- .set_compression(compression_type)
- .build();
+ let mut compression_string = compression.to_string();
+ if let Some(level) = compression_level {
+ compression_string.push_str(&format!("({level})"));
+ }
+
+ let mut options = TableParquetOptions::default();
+ options.global.compression = Some(compression_string);
wait_for_future(
py,
self.df.as_ref().clone().write_parquet(
path,
DataFrameWriteOptions::new(),
- Option::from(writer_properties),
+ Option::from(options),
),
)?;
Ok(())
@@ -397,7 +401,7 @@ impl PyDataFrame {
self.df
.as_ref()
.clone()
- .write_json(path, DataFrameWriteOptions::new()),
+ .write_json(path, DataFrameWriteOptions::new(), None),
)?;
Ok(())
}
diff --git a/src/dataset_exec.rs b/src/dataset_exec.rs
index 89f73a9..4c9e2f3 100644
--- a/src/dataset_exec.rs
+++ b/src/dataset_exec.rs
@@ -32,11 +32,11 @@ use datafusion::arrow::pyarrow::PyArrowType;
use datafusion::arrow::record_batch::RecordBatch;
use datafusion::error::{DataFusionError as InnerDataFusionError, Result as
DFResult};
use datafusion::execution::context::TaskContext;
-use datafusion::physical_expr::PhysicalSortExpr;
+use datafusion::physical_expr::{EquivalenceProperties, PhysicalSortExpr};
use datafusion::physical_plan::stream::RecordBatchStreamAdapter;
use datafusion::physical_plan::{
- DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning,
SendableRecordBatchStream,
- Statistics,
+ DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan,
ExecutionPlanProperties,
+ Partitioning, SendableRecordBatchStream, Statistics,
};
use datafusion_expr::utils::conjunction;
use datafusion_expr::Expr;
@@ -73,6 +73,7 @@ pub(crate) struct DatasetExec {
columns: Option<Vec<String>>,
filter_expr: Option<PyObject>,
projected_statistics: Statistics,
+ plan_properties: datafusion::physical_plan::PlanProperties,
}
impl DatasetExec {
@@ -134,6 +135,12 @@ impl DatasetExec {
.map_err(PyErr::from)?;
let projected_statistics = Statistics::new_unknown(&schema);
+ let plan_properties = datafusion::physical_plan::PlanProperties::new(
+ EquivalenceProperties::new(schema.clone()),
+ Partitioning::UnknownPartitioning(fragments.len()),
+ ExecutionMode::Bounded,
+ );
+
Ok(DatasetExec {
dataset: dataset.into(),
schema,
@@ -141,6 +148,7 @@ impl DatasetExec {
columns,
filter_expr,
projected_statistics,
+ plan_properties,
})
}
}
@@ -156,18 +164,6 @@ impl ExecutionPlan for DatasetExec {
self.schema.clone()
}
- /// Get the output partitioning of this plan
- fn output_partitioning(&self) -> Partitioning {
- Python::with_gil(|py| {
- let fragments = self.fragments.as_ref(py);
- Partitioning::UnknownPartitioning(fragments.len())
- })
- }
-
- fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
- None
- }
-
fn children(&self) -> Vec<Arc<dyn ExecutionPlan>> {
// this is a leaf node and has no children
vec![]
@@ -240,6 +236,29 @@ impl ExecutionPlan for DatasetExec {
fn statistics(&self) -> DFResult<Statistics> {
Ok(self.projected_statistics.clone())
}
+
+ fn properties(&self) -> &datafusion::physical_plan::PlanProperties {
+ &self.plan_properties
+ }
+}
+
+impl ExecutionPlanProperties for DatasetExec {
+ /// Get the output partitioning of this plan
+ fn output_partitioning(&self) -> &Partitioning {
+ self.plan_properties.output_partitioning()
+ }
+
+ fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
+ None
+ }
+
+ fn execution_mode(&self) -> datafusion::physical_plan::ExecutionMode {
+ self.plan_properties.execution_mode
+ }
+
+ fn equivalence_properties(&self) ->
&datafusion::physical_expr::EquivalenceProperties {
+ &self.plan_properties.eq_properties
+ }
}
impl DisplayAs for DatasetExec {
diff --git a/src/expr.rs b/src/expr.rs
index 0958c4a..3be0d02 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -382,6 +382,11 @@ impl PyExpr {
"ScalarValue::LargeList".to_string(),
),
)),
+ ScalarValue::Union(_, _, _) => Err(py_datafusion_err(
+ datafusion_common::DataFusionError::NotImplemented(
+ "ScalarValue::Union".to_string(),
+ ),
+ )),
},
_ => Err(py_type_err(format!(
"Non Expr::Literal encountered in types: {:?}",
diff --git a/src/functions.rs b/src/functions.rs
index 666e1ec..7f6b1a8 100644
--- a/src/functions.rs
+++ b/src/functions.rs
@@ -24,7 +24,7 @@ use crate::expr::window::PyWindowFrame;
use crate::expr::PyExpr;
use datafusion::execution::FunctionRegistry;
use datafusion::functions;
-use datafusion_common::{Column, TableReference};
+use datafusion_common::{Column, ScalarValue, TableReference};
use datafusion_expr::expr::Alias;
use datafusion_expr::{
aggregate_function,
@@ -36,56 +36,85 @@ use datafusion_expr::{
};
#[pyfunction]
-pub fn isnan(expr: PyExpr) -> PyExpr {
- functions::expr_fn::isnan(expr.into()).into()
+fn in_list(expr: PyExpr, value: Vec<PyExpr>, negated: bool) -> PyExpr {
+ datafusion_expr::in_list(
+ expr.expr,
+ value.into_iter().map(|x| x.expr).collect::<Vec<_>>(),
+ negated,
+ )
+ .into()
}
#[pyfunction]
-pub fn nullif(expr1: PyExpr, expr2: PyExpr) -> PyExpr {
- functions::expr_fn::nullif(expr1.into(), expr2.into()).into()
+#[pyo3(signature = (*exprs))]
+fn make_array(exprs: Vec<PyExpr>) -> PyExpr {
+ datafusion_functions_array::expr_fn::make_array(exprs.into_iter().map(|x|
x.into()).collect())
+ .into()
}
#[pyfunction]
-pub fn encode(input: PyExpr, encoding: PyExpr) -> PyExpr {
- functions::expr_fn::encode(input.into(), encoding.into()).into()
+#[pyo3(signature = (*exprs))]
+fn array(exprs: Vec<PyExpr>) -> PyExpr {
+ // alias for make_array
+ make_array(exprs)
}
#[pyfunction]
-pub fn decode(input: PyExpr, encoding: PyExpr) -> PyExpr {
- functions::expr_fn::decode(input.into(), encoding.into()).into()
+#[pyo3(signature = (*exprs))]
+fn array_concat(exprs: Vec<PyExpr>) -> PyExpr {
+ let exprs = exprs.into_iter().map(|x| x.into()).collect();
+ datafusion_functions_array::expr_fn::array_concat(exprs).into()
}
#[pyfunction]
-pub fn array_to_string(expr: PyExpr, delim: PyExpr) -> PyExpr {
- datafusion_functions_array::expr_fn::array_to_string(expr.into(),
delim.into()).into()
+#[pyo3(signature = (*exprs))]
+fn array_cat(exprs: Vec<PyExpr>) -> PyExpr {
+ array_concat(exprs)
}
#[pyfunction]
-pub fn array_join(expr: PyExpr, delim: PyExpr) -> PyExpr {
- // alias for array_to_string
- array_to_string(expr, delim)
+#[pyo3(signature = (array, element, index = 1))]
+fn array_position(array: PyExpr, element: PyExpr, index: Option<i64>) ->
PyExpr {
+ let index = ScalarValue::Int64(index);
+ let index = Expr::Literal(index);
+ datafusion_functions_array::expr_fn::array_position(array.into(),
element.into(), index).into()
}
#[pyfunction]
-pub fn list_to_string(expr: PyExpr, delim: PyExpr) -> PyExpr {
- // alias for array_to_string
- array_to_string(expr, delim)
+#[pyo3(signature = (array, element, index = 1))]
+fn array_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr
{
+ // alias of array_position
+ array_position(array, element, index)
}
#[pyfunction]
-pub fn list_join(expr: PyExpr, delim: PyExpr) -> PyExpr {
- // alias for array_to_string
- array_to_string(expr, delim)
+#[pyo3(signature = (array, element, index = 1))]
+fn list_position(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr
{
+ // alias of array_position
+ array_position(array, element, index)
}
#[pyfunction]
-fn in_list(expr: PyExpr, value: Vec<PyExpr>, negated: bool) -> PyExpr {
- datafusion_expr::in_list(
- expr.expr,
- value.into_iter().map(|x| x.expr).collect::<Vec<_>>(),
- negated,
- )
- .into()
+#[pyo3(signature = (array, element, index = 1))]
+fn list_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
+ // alias of array_position
+ array_position(array, element, index)
+}
+
+#[pyfunction]
+#[pyo3(signature = (array, begin, end, stride = 1))]
+fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<i64>)
-> PyExpr {
+ let stride = ScalarValue::Int64(stride);
+ let stride = Expr::Literal(stride);
+ datafusion_functions_array::expr_fn::array_slice(array.into(),
begin.into(), end.into(), stride)
+ .into()
+}
+
+#[pyfunction]
+#[pyo3(signature = (array, begin, end, stride = 1))]
+fn list_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<i64>)
-> PyExpr {
+ // alias of array_slice
+ array_slice(array, begin, end, stride)
}
/// Computes a binary hash of the given data. type is the algorithm to use.
@@ -95,7 +124,7 @@ fn in_list(expr: PyExpr, value: Vec<PyExpr>, negated: bool)
-> PyExpr {
#[pyo3(signature = (value, method))]
fn digest(value: PyExpr, method: PyExpr) -> PyExpr {
PyExpr {
- expr: datafusion_expr::digest(value.expr, method.expr),
+ expr: functions::expr_fn::digest(value.expr, method.expr),
}
}
@@ -162,6 +191,7 @@ fn count_star() -> PyResult<PyExpr> {
distinct: false,
filter: None,
order_by: None,
+ null_treatment: None,
}),
})
}
@@ -214,6 +244,7 @@ fn window(
.map(|x| x.expr)
.collect::<Vec<_>>(),
window_frame,
+ null_treatment: None,
}),
})
}
@@ -256,46 +287,124 @@ macro_rules! aggregate_function {
distinct,
filter: None,
order_by: None,
+ null_treatment: None,
});
expr.into()
}
};
}
-scalar_function!(abs, Abs);
-scalar_function!(acos, Acos);
+/// Generates a [pyo3] wrapper for [datafusion::functions::expr_fn]
+///
+/// These functions have explicit named arguments.
+macro_rules! expr_fn {
+ ($NAME: ident) => {
+ expr_fn!($NAME, $NAME, , stringify!($NAME));
+ };
+ ($NAME:ident, $($arg:ident)*) => {
+ expr_fn!($NAME, $NAME, $($arg)*, stringify!($FUNC));
+ };
+ ($NAME:ident, $FUNC:ident, $($arg:ident)*) => {
+ expr_fn!($NAME, $FUNC, $($arg)*, stringify!($FUNC));
+ };
+ ($NAME: ident, $DOC: expr) => {
+ expr_fn!($NAME, $NAME, ,$DOC);
+ };
+ ($NAME: ident, $($arg:ident)*, $DOC: expr) => {
+ expr_fn!($NAME, $NAME, $($arg)* ,$DOC);
+ };
+ ($NAME: ident, $FUNC: ident, $($arg:ident)*, $DOC: expr) => {
+ #[doc = $DOC]
+ #[pyfunction]
+ fn $NAME($($arg: PyExpr),*) -> PyExpr {
+ functions::expr_fn::$FUNC($($arg.into()),*).into()
+ }
+ };
+}
+
+/// Generates a [pyo3] wrapper for [datafusion::functions::expr_fn]
+///
+/// These functions take a single `Vec<PyExpr>` argument using `pyo3(signature
= (*args))`.
+macro_rules! expr_fn_vec {
+ ($NAME: ident) => {
+ expr_fn_vec!($NAME, $NAME, stringify!($NAME));
+ };
+ ($NAME: ident, $DOC: expr) => {
+ expr_fn_vec!($NAME, $NAME, $DOC);
+ };
+ ($NAME: ident, $FUNC: ident, $DOC: expr) => {
+ #[doc = $DOC]
+ #[pyfunction]
+ #[pyo3(signature = (*args))]
+ fn $NAME(args: Vec<PyExpr>) -> PyExpr {
+ let args = args.into_iter().map(|e| e.into()).collect::<Vec<_>>();
+ functions::expr_fn::$FUNC(args).into()
+ }
+ };
+}
+
+/// Generates a [pyo3] wrapper for [datafusion_functions_array::expr_fn]
+///
+/// These functions have explicit named arguments.
+macro_rules! array_fn {
+ ($NAME: ident) => {
+ array_fn!($NAME, $NAME, , stringify!($NAME));
+ };
+ ($NAME:ident, $($arg:ident)*) => {
+ array_fn!($NAME, $NAME, $($arg)*, stringify!($FUNC));
+ };
+ ($NAME: ident, $FUNC:ident, $($arg:ident)*) => {
+ array_fn!($NAME, $FUNC, $($arg)*, stringify!($FUNC));
+ };
+ ($NAME: ident, $DOC: expr) => {
+ array_fn!($NAME, $NAME, , $DOC);
+ };
+ ($NAME: ident, $FUNC:ident, $($arg:ident)*, $DOC:expr) => {
+ #[doc = $DOC]
+ #[pyfunction]
+ fn $NAME($($arg: PyExpr),*) -> PyExpr {
+ datafusion_functions_array::expr_fn::$FUNC($($arg.into()),*).into()
+ }
+ };
+}
+
+expr_fn!(abs, num);
+expr_fn!(acos, num);
scalar_function!(acosh, Acosh);
-scalar_function!(ascii, Ascii, "Returns the numeric code of the first
character of the argument. In UTF8 encoding, returns the Unicode code point of
the character. In other multibyte encodings, the argument must be an ASCII
character.");
-scalar_function!(asin, Asin);
+expr_fn!(ascii, arg1, "Returns the numeric code of the first character of the
argument. In UTF8 encoding, returns the Unicode code point of the character. In
other multibyte encodings, the argument must be an ASCII character.");
+expr_fn!(asin, num);
scalar_function!(asinh, Asinh);
scalar_function!(atan, Atan);
scalar_function!(atanh, Atanh);
scalar_function!(atan2, Atan2);
-scalar_function!(
+expr_fn!(
bit_length,
- BitLength,
+ arg,
"Returns number of bits in the string (8 times the octet_length)."
);
-scalar_function!(btrim, Btrim, "Removes the longest string containing only
characters in characters (a space by default) from the start and end of
string.");
+expr_fn_vec!(btrim, "Removes the longest string containing only characters in
characters (a space by default) from the start and end of string.");
scalar_function!(cbrt, Cbrt);
scalar_function!(ceil, Ceil);
-scalar_function!(
+expr_fn!(
character_length,
- CharacterLength,
+ string,
"Returns number of characters in the string."
);
-scalar_function!(length, CharacterLength);
-scalar_function!(char_length, CharacterLength);
-scalar_function!(chr, Chr, "Returns the character with the given code.");
+expr_fn!(length, string);
+expr_fn!(char_length, string);
+expr_fn!(chr, arg, "Returns the character with the given code.");
scalar_function!(coalesce, Coalesce);
scalar_function!(cos, Cos);
scalar_function!(cosh, Cosh);
scalar_function!(degrees, Degrees);
+expr_fn!(decode, input encoding);
+expr_fn!(encode, input encoding);
scalar_function!(exp, Exp);
scalar_function!(factorial, Factorial);
scalar_function!(floor, Floor);
scalar_function!(gcd, Gcd);
scalar_function!(initcap, InitCap, "Converts the first letter of each word to
upper case and the rest to lower case. Words are sequences of alphanumeric
characters separated by non-alphanumeric characters.");
+expr_fn!(isnan, num);
scalar_function!(iszero, Iszero);
scalar_function!(lcm, Lcm);
scalar_function!(left, Left, "Returns first n characters in the string, or
when n is negative, returns all but last |n| characters.");
@@ -303,12 +412,12 @@ scalar_function!(ln, Ln);
scalar_function!(log, Log);
scalar_function!(log10, Log10);
scalar_function!(log2, Log2);
-scalar_function!(lower, Lower, "Converts the string to all lower case");
+expr_fn!(lower, arg1, "Converts the string to all lower case");
scalar_function!(lpad, Lpad, "Extends the string to length length by
prepending the characters fill (a space by default). If the string is already
longer than length then it is truncated (on the right).");
-scalar_function!(ltrim, Ltrim, "Removes the longest string containing only
characters in characters (a space by default) from the start of string.");
-scalar_function!(
+expr_fn_vec!(ltrim, "Removes the longest string containing only characters in
characters (a space by default) from the start of string.");
+expr_fn!(
md5,
- MD5,
+ input_arg,
"Computes the MD5 hash of the argument, with the result written in
hexadecimal."
);
scalar_function!(
@@ -316,25 +425,22 @@ scalar_function!(
Nanvl,
"Returns x if x is not NaN otherwise returns y."
);
-scalar_function!(octet_length, OctetLength, "Returns number of bytes in the
string. Since this version of the function accepts type character directly, it
will not strip trailing spaces.");
+expr_fn!(nullif, arg_1 arg_2);
+expr_fn_vec!(octet_length, "Returns number of bytes in the string. Since this
version of the function accepts type character directly, it will not strip
trailing spaces.");
scalar_function!(pi, Pi);
scalar_function!(power, Power);
scalar_function!(pow, Power);
scalar_function!(radians, Radians);
-scalar_function!(regexp_match, RegexpMatch);
-scalar_function!(
+expr_fn!(regexp_match, input_arg1 input_arg2);
+expr_fn!(
regexp_replace,
- RegexpReplace,
- "Replaces substring(s) matching a POSIX regular expression"
+ arg1 arg2 arg3 arg4,
+ "Replaces substring(s) matching a POSIX regular expression."
);
-scalar_function!(
- repeat,
- Repeat,
- "Repeats string the specified number of times."
-);
-scalar_function!(
+expr_fn!(repeat, string n, "Repeats string the specified number of times.");
+expr_fn!(
replace,
- Replace,
+ string from to,
"Replaces all occurrences in string of substring from with substring to."
);
scalar_function!(
@@ -345,117 +451,108 @@ scalar_function!(
scalar_function!(right, Right, "Returns last n characters in the string, or
when n is negative, returns all but first |n| characters.");
scalar_function!(round, Round);
scalar_function!(rpad, Rpad, "Extends the string to length length by appending
the characters fill (a space by default). If the string is already longer than
length then it is truncated.");
-scalar_function!(rtrim, Rtrim, "Removes the longest string containing only
characters in characters (a space by default) from the end of string.");
-scalar_function!(sha224, SHA224);
-scalar_function!(sha256, SHA256);
-scalar_function!(sha384, SHA384);
-scalar_function!(sha512, SHA512);
+expr_fn_vec!(rtrim, "Removes the longest string containing only characters in
characters (a space by default) from the end of string.");
+expr_fn!(sha224, input_arg1);
+expr_fn!(sha256, input_arg1);
+expr_fn!(sha384, input_arg1);
+expr_fn!(sha512, input_arg1);
scalar_function!(signum, Signum);
scalar_function!(sin, Sin);
scalar_function!(sinh, Sinh);
-scalar_function!(
+expr_fn!(
split_part,
- SplitPart,
+ string delimiter index,
"Splits string at occurrences of delimiter and returns the n'th field
(counting from one)."
);
scalar_function!(sqrt, Sqrt);
-scalar_function!(
- starts_with,
- StartsWith,
- "Returns true if string starts with prefix."
-);
+expr_fn!(starts_with, arg1 arg2, "Returns true if string starts with prefix.");
scalar_function!(strpos, Strpos, "Returns starting index of specified
substring within string, or zero if it's not present. (Same as
position(substring in string), but note the reversed argument order.)");
scalar_function!(substr, Substr);
-scalar_function!(tan, Tan);
-scalar_function!(tanh, Tanh);
-scalar_function!(
+expr_fn!(tan, num);
+expr_fn!(tanh, num);
+expr_fn!(
to_hex,
- ToHex,
+ arg1,
"Converts the number to its equivalent hexadecimal representation."
);
-scalar_function!(now, Now);
-scalar_function!(to_timestamp, ToTimestamp);
-scalar_function!(to_timestamp_millis, ToTimestampMillis);
-scalar_function!(to_timestamp_micros, ToTimestampMicros);
-scalar_function!(to_timestamp_seconds, ToTimestampSeconds);
-scalar_function!(current_date, CurrentDate);
-scalar_function!(current_time, CurrentTime);
-scalar_function!(datepart, DatePart);
-scalar_function!(date_part, DatePart);
-scalar_function!(date_trunc, DateTrunc);
-scalar_function!(datetrunc, DateTrunc);
-scalar_function!(date_bin, DateBin);
+expr_fn!(now);
+expr_fn_vec!(to_timestamp);
+expr_fn_vec!(to_timestamp_millis);
+expr_fn_vec!(to_timestamp_micros);
+expr_fn_vec!(to_timestamp_seconds);
+expr_fn!(current_date);
+expr_fn!(current_time);
+expr_fn!(date_part, part date);
+expr_fn!(datepart, date_part, part date);
+expr_fn!(date_trunc, part date);
+expr_fn!(datetrunc, date_trunc, part date);
+expr_fn!(date_bin, stride source origin);
+
scalar_function!(translate, Translate, "Replaces each character in string that
matches a character in the from set with the corresponding character in the to
set. If from is longer than to, occurrences of the extra characters in from are
deleted.");
-scalar_function!(trim, Trim, "Removes the longest string containing only
characters in characters (a space by default) from the start, end, or both ends
(BOTH is the default) of string.");
+expr_fn_vec!(trim, "Removes the longest string containing only characters in
characters (a space by default) from the start, end, or both ends (BOTH is the
default) of string.");
scalar_function!(trunc, Trunc);
-scalar_function!(upper, Upper, "Converts the string to all upper case.");
-scalar_function!(make_array, MakeArray);
-scalar_function!(array, MakeArray);
-scalar_function!(range, Range);
-scalar_function!(uuid, Uuid);
-scalar_function!(r#struct, Struct); // Use raw identifier since struct is a
keyword
-scalar_function!(from_unixtime, FromUnixtime);
-scalar_function!(arrow_typeof, ArrowTypeof);
+expr_fn!(upper, arg1, "Converts the string to all upper case.");
+expr_fn!(uuid);
+expr_fn!(r#struct, args); // Use raw identifier since struct is a keyword
+expr_fn!(from_unixtime, unixtime);
+expr_fn!(arrow_typeof, arg_1);
scalar_function!(random, Random);
// Array Functions
-scalar_function!(array_append, ArrayAppend);
-scalar_function!(array_push_back, ArrayAppend);
-scalar_function!(list_append, ArrayAppend);
-scalar_function!(list_push_back, ArrayAppend);
-scalar_function!(array_concat, ArrayConcat);
-scalar_function!(array_cat, ArrayConcat);
-scalar_function!(array_dims, ArrayDims);
-scalar_function!(array_distinct, ArrayDistinct);
-scalar_function!(list_distinct, ArrayDistinct);
-scalar_function!(list_dims, ArrayDims);
-scalar_function!(array_element, ArrayElement);
-scalar_function!(array_extract, ArrayElement);
-scalar_function!(list_element, ArrayElement);
-scalar_function!(list_extract, ArrayElement);
-scalar_function!(array_length, ArrayLength);
-scalar_function!(list_length, ArrayLength);
-scalar_function!(array_has, ArrayHas);
-scalar_function!(array_has_all, ArrayHasAll);
-scalar_function!(array_has_any, ArrayHasAny);
-scalar_function!(array_position, ArrayPosition);
-scalar_function!(array_indexof, ArrayPosition);
-scalar_function!(list_position, ArrayPosition);
-scalar_function!(list_indexof, ArrayPosition);
-scalar_function!(array_positions, ArrayPositions);
-scalar_function!(list_positions, ArrayPositions);
-scalar_function!(array_ndims, ArrayNdims);
-scalar_function!(list_ndims, ArrayNdims);
-scalar_function!(array_prepend, ArrayPrepend);
-scalar_function!(array_push_front, ArrayPrepend);
-scalar_function!(list_prepend, ArrayPrepend);
-scalar_function!(list_push_front, ArrayPrepend);
-scalar_function!(array_pop_back, ArrayPopBack);
-scalar_function!(array_pop_front, ArrayPopFront);
-scalar_function!(array_remove, ArrayRemove);
-scalar_function!(list_remove, ArrayRemove);
-scalar_function!(array_remove_n, ArrayRemoveN);
-scalar_function!(list_remove_n, ArrayRemoveN);
-scalar_function!(array_remove_all, ArrayRemoveAll);
-scalar_function!(list_remove_all, ArrayRemoveAll);
-scalar_function!(array_repeat, ArrayRepeat);
-scalar_function!(array_replace, ArrayReplace);
-scalar_function!(list_replace, ArrayReplace);
-scalar_function!(array_replace_n, ArrayReplaceN);
-scalar_function!(list_replace_n, ArrayReplaceN);
-scalar_function!(array_replace_all, ArrayReplaceAll);
-scalar_function!(list_replace_all, ArrayReplaceAll);
-scalar_function!(array_slice, ArraySlice);
-scalar_function!(list_slice, ArraySlice);
-scalar_function!(array_intersect, ArrayIntersect);
-scalar_function!(list_intersect, ArrayIntersect);
-scalar_function!(array_union, ArrayUnion);
-scalar_function!(list_union, ArrayUnion);
-scalar_function!(array_except, ArrayExcept);
-scalar_function!(list_except, ArrayExcept);
-scalar_function!(array_resize, ArrayResize);
-scalar_function!(list_resize, ArrayResize);
-scalar_function!(flatten, Flatten);
+array_fn!(array_append, array element);
+array_fn!(array_push_back, array_append, array element);
+array_fn!(array_to_string, array delimiter);
+array_fn!(array_join, array_to_string, array delimiter);
+array_fn!(list_to_string, array_to_string, array delimiter);
+array_fn!(list_join, array_to_string, array delimiter);
+array_fn!(list_append, array_append, array element);
+array_fn!(list_push_back, array_append, array element);
+array_fn!(array_dims, array);
+array_fn!(array_distinct, array);
+array_fn!(list_distinct, array_distinct, array);
+array_fn!(list_dims, array_dims, array);
+array_fn!(array_element, array element);
+array_fn!(array_extract, array_element, array element);
+array_fn!(list_element, array_element, array element);
+array_fn!(list_extract, array_element, array element);
+array_fn!(array_length, array);
+array_fn!(list_length, array_length, array);
+array_fn!(array_has, first_array second_array);
+array_fn!(array_has_all, first_array second_array);
+array_fn!(array_has_any, first_array second_array);
+array_fn!(array_positions, array_positions, array element);
+array_fn!(list_positions, array_positions, array element);
+array_fn!(array_ndims, array);
+array_fn!(list_ndims, array_ndims, array);
+array_fn!(array_prepend, element array);
+array_fn!(array_push_front, array_prepend, element array);
+array_fn!(list_prepend, array_prepend, element array);
+array_fn!(list_push_front, array_prepend, element array);
+array_fn!(array_pop_back, array);
+array_fn!(array_pop_front, array);
+array_fn!(array_remove, array element);
+array_fn!(list_remove, array_remove, array element);
+array_fn!(array_remove_n, array element max);
+array_fn!(list_remove_n, array_remove_n, array element max);
+array_fn!(array_remove_all, array element);
+array_fn!(list_remove_all, array_remove_all, array element);
+array_fn!(array_repeat, element count);
+array_fn!(array_replace, array from to);
+array_fn!(list_replace, array_replace, array from to);
+array_fn!(array_replace_n, array from to max);
+array_fn!(list_replace_n, array_replace_n, array from to max);
+array_fn!(array_replace_all, array from to);
+array_fn!(list_replace_all, array_replace_all, array from to);
+array_fn!(array_intersect, first_array second_array);
+array_fn!(list_intersect, array_intersect, first_array second_array);
+array_fn!(array_union, array1 array2);
+array_fn!(list_union, array_union, array1 array2);
+array_fn!(array_except, first_array second_array);
+array_fn!(list_except, array_except, first_array second_array);
+array_fn!(array_resize, array size value);
+array_fn!(list_resize, array_resize, array size value);
+array_fn!(flatten, array);
+array_fn!(range, start stop step);
aggregate_function!(approx_distinct, ApproxDistinct);
aggregate_function!(approx_median, ApproxMedian);
diff --git a/src/physical_plan.rs b/src/physical_plan.rs
index ab78322..51032f2 100644
--- a/src/physical_plan.rs
+++ b/src/physical_plan.rs
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-use datafusion::physical_plan::{displayable, ExecutionPlan};
+use datafusion::physical_plan::{displayable, ExecutionPlan,
ExecutionPlanProperties};
use std::sync::Arc;
use pyo3::prelude::*;
diff --git a/src/udf.rs b/src/udf.rs
index af17b57..69519f4 100644
--- a/src/udf.rs
+++ b/src/udf.rs
@@ -23,7 +23,6 @@ use datafusion::arrow::array::{make_array, Array, ArrayData,
ArrayRef};
use datafusion::arrow::datatypes::DataType;
use datafusion::arrow::pyarrow::{FromPyArrow, PyArrowType, ToPyArrow};
use datafusion::error::DataFusionError;
-use datafusion::physical_plan::functions::make_scalar_function;
use datafusion::physical_plan::udf::ScalarUDF;
use datafusion_expr::create_udf;
use datafusion_expr::function::ScalarFunctionImplementation;
@@ -35,7 +34,8 @@ use crate::utils::parse_volatility;
/// that expects pyarrow arrays. This is more efficient as it performs
/// a zero-copy of the contents.
fn to_rust_function(func: PyObject) -> ScalarFunctionImplementation {
- make_scalar_function(
+ #[allow(deprecated)]
+ datafusion::physical_plan::functions::make_scalar_function(
move |args: &[ArrayRef]| -> Result<ArrayRef, DataFusionError> {
Python::with_gil(|py| {
// 1. cast args to Pyarrow arrays
diff --git a/src/utils.rs b/src/utils.rs
index c5965bd..62cf07d 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -37,9 +37,9 @@ pub(crate) fn get_tokio_runtime(py: Python) ->
PyRef<TokioRuntime> {
}
/// Utility to collect rust futures with GIL released
-pub fn wait_for_future<F: Future>(py: Python, f: F) -> F::Output
+pub fn wait_for_future<F>(py: Python, f: F) -> F::Output
where
- F: Send,
+ F: Future + Send,
F::Output: Send,
{
let runtime: &Runtime = &get_tokio_runtime(py).0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
