You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2023/12/28 20:09:44 UTC
(arrow-datafusion-python) branch main updated: Prepare 34.0.0 Release (#550)
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/arrow-datafusion-python.git
The following commit(s) were added to refs/heads/main by this push:
new 2889de0 Prepare 34.0.0 Release (#550)
2889de0 is described below
commit 2889de097dbc6002030c54726dd8fd1915df4a76
Author: Andy Grove <an...@gmail.com>
AuthorDate: Thu Dec 28 13:09:38 2023 -0700
Prepare 34.0.0 Release (#550)
---
CHANGELOG.md | 9 +
Cargo.lock | 558 ++++++++++++++++++++++++---------------------
Cargo.toml | 16 +-
src/common/data_type.rs | 8 +-
src/common/schema.rs | 2 +-
src/context.rs | 2 +-
src/dataframe.rs | 2 +-
src/dataset_exec.rs | 2 +-
src/expr.rs | 17 +-
src/expr/aggregate.rs | 14 +-
src/expr/aggregate_expr.rs | 4 +-
src/expr/distinct.rs | 27 ++-
src/functions.rs | 19 +-
src/udaf.rs | 2 +-
src/udf.rs | 2 +-
15 files changed, 382 insertions(+), 302 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d875cf1..4af70d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,15 @@
# DataFusion Python Changelog
+## [34.0.0](https://github.com/apache/arrow-datafusion-python/tree/34.0.0) (2023-12-28)
+
+**Merged pull requests:**
+
+- Adjust visibility of crate private members & Functions [#537](https://github.com/apache/arrow-datafusion-python/pull/537) (jdye64)
+- Update json.rst [#538](https://github.com/apache/arrow-datafusion-python/pull/538) (ray-andrew)
+- Enable mimalloc local_dynamic_tls feature [#540](https://github.com/apache/arrow-datafusion-python/pull/540) (jdye64)
+- Enable substrait feature to be built by default in CI, for nightlies … [#544](https://github.com/apache/arrow-datafusion-python/pull/544) (jdye64)
+
## [33.0.0](https://github.com/apache/arrow-datafusion-python/tree/33.0.0) (2023-11-16)
**Merged pull requests:**
diff --git a/Cargo.lock b/Cargo.lock
index c2d3411..db776d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -130,9 +130,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "arrow"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8919668503a4f2d8b6da96fa7c16e93046bfb3412ffcfa1e5dc7d2e3adcb378"
+checksum = "5bc25126d18a012146a888a0298f2c22e1150327bd2765fc76d710a556b2d614"
dependencies = [
"ahash",
"arrow-arith",
@@ -153,9 +153,9 @@ dependencies = [
[[package]]
name = "arrow-arith"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef983914f477d4278b068f13b3224b7d19eb2b807ac9048544d3bfebdf2554c4"
+checksum = "34ccd45e217ffa6e53bbb0080990e77113bdd4e91ddb84e97b77649810bcf1a7"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -168,9 +168,9 @@ dependencies = [
[[package]]
name = "arrow-array"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6eaf89041fa5937940ae390294ece29e1db584f46d995608d6e5fe65a2e0e9b"
+checksum = "6bda9acea48b25123c08340f3a8ac361aa0f74469bb36f5ee9acf923fce23e9d"
dependencies = [
"ahash",
"arrow-buffer",
@@ -179,15 +179,15 @@ dependencies = [
"chrono",
"chrono-tz",
"half",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"num",
]
[[package]]
name = "arrow-buffer"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55512d988c6fbd76e514fd3ff537ac50b0a675da5a245e4fdad77ecfd654205f"
+checksum = "01a0fc21915b00fc6c2667b069c1b64bdd920982f426079bc4a7cab86822886c"
dependencies = [
"bytes",
"half",
@@ -196,15 +196,16 @@ dependencies = [
[[package]]
name = "arrow-cast"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655ee51a2156ba5375931ce21c1b2494b1d9260e6dcdc6d4db9060c37dc3325b"
+checksum = "5dc0368ed618d509636c1e3cc20db1281148190a78f43519487b2daf07b63b4a"
dependencies = [
"arrow-array",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"arrow-select",
+ "base64",
"chrono",
"comfy-table",
"half",
@@ -214,9 +215,9 @@ dependencies = [
[[package]]
name = "arrow-csv"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bb689997ad5b6660b3ce3638bd6b383d668ec555ed41ad7c6559cbb2e4f91"
+checksum = "2e09aa6246a1d6459b3f14baeaa49606cfdbca34435c46320e14054d244987ca"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -233,9 +234,9 @@ dependencies = [
[[package]]
name = "arrow-data"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dc2b9fec74763427e2e5575b8cc31ce96ba4c9b4eb05ce40e0616d9fad12461"
+checksum = "907fafe280a3874474678c1858b9ca4cb7fd83fb8034ff5b6d6376205a08c634"
dependencies = [
"arrow-buffer",
"arrow-schema",
@@ -245,9 +246,9 @@ dependencies = [
[[package]]
name = "arrow-ipc"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eaa6ab203cc6d89b7eaa1ac781c1dfeef325454c5d5a0419017f95e6bafc03c"
+checksum = "79a43d6808411886b8c7d4f6f7dd477029c1e77ffffffb7923555cc6579639cd"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -259,9 +260,9 @@ dependencies = [
[[package]]
name = "arrow-json"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb64e30d9b73f66fdc5c52d5f4cf69bbf03d62f64ffeafa0715590a5320baed7"
+checksum = "d82565c91fd627922ebfe2810ee4e8346841b6f9361b87505a9acea38b614fee"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -279,9 +280,9 @@ dependencies = [
[[package]]
name = "arrow-ord"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a818951c0d11c428dda03e908175969c262629dd20bd0850bd6c7a8c3bfe48"
+checksum = "9b23b0e53c0db57c6749997fd343d4c0354c994be7eca67152dd2bdb9a3e1bb4"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -294,9 +295,9 @@ dependencies = [
[[package]]
name = "arrow-row"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d664318bc05f930559fc088888f0f7174d3c5bc888c0f4f9ae8f23aa398ba3"
+checksum = "361249898d2d6d4a6eeb7484be6ac74977e48da12a4dd81a708d620cc558117a"
dependencies = [
"ahash",
"arrow-array",
@@ -304,23 +305,23 @@ dependencies = [
"arrow-data",
"arrow-schema",
"half",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
]
[[package]]
name = "arrow-schema"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf4d737bba93da59f16129bec21e087aed0be84ff840e74146d4703879436cb"
+checksum = "09e28a5e781bf1b0f981333684ad13f5901f4cd2f20589eab7cf1797da8fc167"
dependencies = [
"bitflags 2.4.1",
]
[[package]]
name = "arrow-select"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374c4c3b812ecc2118727b892252a4a4308f87a8aca1dbf09f3ce4bc578e668a"
+checksum = "4f6208466590960efc1d2a7172bc4ff18a67d6e25c529381d7f96ddaf0dc4036"
dependencies = [
"ahash",
"arrow-array",
@@ -332,9 +333,9 @@ dependencies = [
[[package]]
name = "arrow-string"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15aed5624bb23da09142f58502b59c23f5bea607393298bb81dab1ce60fc769"
+checksum = "a4a48149c63c11c9ff571e50ab8f017d2a7cb71037a882b42f6354ed2da9acc7"
dependencies = [
"arrow-array",
"arrow-buffer",
@@ -372,7 +373,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -383,7 +384,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -551,7 +552,7 @@ dependencies = [
"iana-time-zone",
"num-traits",
"serde",
- "windows-targets",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -615,9 +616,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
[[package]]
name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
dependencies = [
"core-foundation-sys",
"libc",
@@ -625,9 +626,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "core2"
@@ -706,7 +707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -714,9 +715,9 @@ dependencies = [
[[package]]
name = "datafusion"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "676796427e638d85e9eadf13765705212be60b34f8fc5d3934d95184c63ca1b4"
+checksum = "193fd1e7628278d0641c5122860f9a7fd6a1d77d055838d12f55d15bbe28d4d0"
dependencies = [
"ahash",
"apache-avro",
@@ -740,9 +741,9 @@ dependencies = [
"futures",
"glob",
"half",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"indexmap",
- "itertools",
+ "itertools 0.12.0",
"log",
"num-traits",
"num_cpus",
@@ -763,9 +764,9 @@ dependencies = [
[[package]]
name = "datafusion-common"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e23b3d21a6531259d291bd20ce59282ea794bda1018b0a1e278c13cd52e50c"
+checksum = "548bc49c4a489e3de474813831ea556dc9d368f9ed8d867b1493da42e8e9f613"
dependencies = [
"ahash",
"apache-avro",
@@ -775,6 +776,7 @@ dependencies = [
"arrow-schema",
"chrono",
"half",
+ "libc",
"num_cpus",
"object_store",
"parquet",
@@ -784,9 +786,9 @@ dependencies = [
[[package]]
name = "datafusion-execution"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de1fd0d8db0f2b8e4f4121bfa1c7c09d3a5c08a0a65c2229cd849eb65cff855"
+checksum = "ecc865657ffcf4da5ff08bdc6436a9a833bc0aa96c3254c8d18ab8a0ad4e437d"
dependencies = [
"arrow",
"chrono",
@@ -794,7 +796,7 @@ dependencies = [
"datafusion-common",
"datafusion-expr",
"futures",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"log",
"object_store",
"parking_lot",
@@ -805,14 +807,15 @@ dependencies = [
[[package]]
name = "datafusion-expr"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e227fe88bf6730cab378d0cd8fc4c6b2ea42bc7e414a8ea9feba7225932735"
+checksum = "33c473f72d8d81a532e63f6e562ed66dd9209dfd8e433d9712abd42444ee161e"
dependencies = [
"ahash",
"arrow",
"arrow-array",
"datafusion-common",
+ "paste",
"sqlparser",
"strum",
"strum_macros",
@@ -820,9 +823,9 @@ dependencies = [
[[package]]
name = "datafusion-optimizer"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6648e62ea7605b9bfcd87fdc9d67e579c3b9ac563a87734ae5fe6d79ee4547"
+checksum = "cb6218318001d2f6783b7fffa17592318f65f26609d7aab605a3dd0c7c2e2618"
dependencies = [
"arrow",
"async-trait",
@@ -830,17 +833,17 @@ dependencies = [
"datafusion-common",
"datafusion-expr",
"datafusion-physical-expr",
- "hashbrown 0.14.2",
- "itertools",
+ "hashbrown 0.14.3",
+ "itertools 0.12.0",
"log",
"regex-syntax",
]
[[package]]
name = "datafusion-physical-expr"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f32b8574add16a32411a9b3fb3844ac1fc09ab4e7be289f86fd56d620e4f2508"
+checksum = "9e1ca7e35ca22f9dc506c2375b92054b03ccf91afe25c0a90b395a1473a09735"
dependencies = [
"ahash",
"arrow",
@@ -855,11 +858,10 @@ dependencies = [
"datafusion-common",
"datafusion-expr",
"half",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"hex",
"indexmap",
- "itertools",
- "libc",
+ "itertools 0.12.0",
"log",
"md-5",
"paste",
@@ -873,9 +875,9 @@ dependencies = [
[[package]]
name = "datafusion-physical-plan"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796abd77d5bfecd9e5275a99daf0ec45f5b3a793ec431349ce8211a67826fd22"
+checksum = "ddde97adefcca3a55257c646ffee2a95b6cac66f74d1146a6e3a6dbb37830631"
dependencies = [
"ahash",
"arrow",
@@ -890,9 +892,9 @@ dependencies = [
"datafusion-physical-expr",
"futures",
"half",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"indexmap",
- "itertools",
+ "itertools 0.12.0",
"log",
"once_cell",
"parking_lot",
@@ -904,7 +906,7 @@ dependencies = [
[[package]]
name = "datafusion-python"
-version = "33.0.0"
+version = "34.0.0"
dependencies = [
"async-trait",
"datafusion",
@@ -923,7 +925,7 @@ dependencies = [
"pyo3-build-config",
"rand",
"regex-syntax",
- "syn 2.0.39",
+ "syn 2.0.41",
"tokio",
"url",
"uuid",
@@ -931,9 +933,9 @@ dependencies = [
[[package]]
name = "datafusion-sql"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced70b8a5648ba7b95c61fc512183c33287ffe2c9f22ffe22700619d7d48c84f"
+checksum = "a60d9d6460a64fddb8663db41da97e6b8b0bf79da42f997ebe81722731eaf0e5"
dependencies = [
"arrow",
"arrow-schema",
@@ -945,14 +947,14 @@ dependencies = [
[[package]]
name = "datafusion-substrait"
-version = "33.0.0"
+version = "34.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f8fe74a4541eccbd096aa9fa3e734f1387a831613c9a3cb4f06bf7283ec77b7"
+checksum = "2243428e8df8b2c5ce2c9e3af588312ae89c1b073c52de5693ec44ba29674547"
dependencies = [
"async-recursion",
"chrono",
"datafusion",
- "itertools",
+ "itertools 0.12.0",
"object_store",
"prost",
"prost-types",
@@ -1006,12 +1008,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
dependencies = [
"libc",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1054,9 +1056,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
"percent-encoding",
]
@@ -1117,7 +1119,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -1173,9 +1175,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
[[package]]
name = "git2"
@@ -1237,9 +1239,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
dependencies = [
"ahash",
"allocator-api2",
@@ -1265,11 +1267,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "home"
-version = "0.5.5"
+version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1285,9 +1287,9 @@ dependencies = [
[[package]]
name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
"http",
@@ -1375,9 +1377,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -1390,7 +1392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
"equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
]
[[package]]
@@ -1420,11 +1422,20 @@ dependencies = [
"either",
]
+[[package]]
+name = "itertools"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
[[package]]
name = "jobserver"
@@ -1437,9 +1448,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.65"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
dependencies = [
"wasm-bindgen",
]
@@ -1516,9 +1527,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.150"
+version = "0.2.151"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]]
name = "libflate"
@@ -1586,9 +1597,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.4.11"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
[[package]]
name = "lock_api"
@@ -1677,13 +1688,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.9"
+version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
dependencies = [
"libc",
"wasi",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1790,9 +1801,9 @@ dependencies = [
[[package]]
name = "object_store"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f930c88a43b1c3f6e776dfe495b4afab89882dbc81530c632db2ed65451ebcb4"
+checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050"
dependencies = [
"async-trait",
"base64",
@@ -1801,13 +1812,13 @@ dependencies = [
"futures",
"humantime",
"hyper",
- "itertools",
+ "itertools 0.11.0",
"parking_lot",
"percent-encoding",
"quick-xml",
"rand",
"reqwest",
- "ring 0.16.20",
+ "ring",
"rustls-pemfile",
"serde",
"serde_json",
@@ -1820,9 +1831,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "ordered-float"
@@ -1853,14 +1864,14 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
- "windows-targets",
+ "windows-targets 0.48.5",
]
[[package]]
name = "parquet"
-version = "48.0.1"
+version = "49.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bfe55df96e3f02f11bf197ae37d91bb79801631f82f6195dd196ef521df3597"
+checksum = "af88740a842787da39b3d69ce5fbf6fce97d20211d3b299fee0a0da6430c74d4"
dependencies = [
"ahash",
"arrow-array",
@@ -1876,7 +1887,7 @@ dependencies = [
"chrono",
"flate2",
"futures",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.3",
"lz4_flex",
"num",
"num-bigint",
@@ -1907,9 +1918,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "petgraph"
@@ -1990,23 +2001,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "prost"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312"
+checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
dependencies = [
"bytes",
"prost-derive",
@@ -2014,13 +2025,13 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa3d084c8704911bfefb2771be2f9b6c5c0da7343a71e0021ee3c665cada738"
+checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
dependencies = [
"bytes",
"heck",
- "itertools",
+ "itertools 0.11.0",
"log",
"multimap",
"once_cell",
@@ -2034,22 +2045,22 @@ dependencies = [
[[package]]
name = "prost-derive"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc"
+checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
dependencies = [
"anyhow",
- "itertools",
+ "itertools 0.11.0",
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
name = "prost-types"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8339f32236f590281e2f6368276441394fcd1b2133b549cc895d0ae80f2f9a52"
+checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
dependencies = [
"prost",
]
@@ -2109,7 +2120,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2121,7 +2132,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2132,9 +2143,9 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
[[package]]
name = "quick-xml"
-version = "0.30.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
dependencies = [
"memchr",
"serde",
@@ -2277,31 +2288,16 @@ dependencies = [
[[package]]
name = "ring"
-version = "0.16.20"
+version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
dependencies = [
"cc",
"getrandom",
"libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
- "windows-sys",
+ "spin",
+ "untrusted",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2327,25 +2323,25 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.24"
+version = "0.38.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
dependencies = [
"bitflags 2.4.1",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
name = "rustls"
-version = "0.21.9"
+version = "0.21.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
dependencies = [
"log",
- "ring 0.17.5",
+ "ring",
"rustls-webpki",
"sct",
]
@@ -2365,8 +2361,8 @@ version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
- "ring 0.17.5",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
]
[[package]]
@@ -2377,9 +2373,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
[[package]]
name = "same-file"
@@ -2426,8 +2422,8 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
- "ring 0.17.5",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
]
[[package]]
@@ -2444,22 +2440,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
-version = "1.0.192"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.192"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2493,7 +2489,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2577,9 +2573,9 @@ dependencies = [
[[package]]
name = "snap"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
[[package]]
name = "socket2"
@@ -2598,15 +2594,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
dependencies = [
"libc",
- "windows-sys",
+ "windows-sys 0.48.0",
]
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
[[package]]
name = "spin"
version = "0.9.8"
@@ -2615,9 +2605,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "sqlparser"
-version = "0.39.0"
+version = "0.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7"
+checksum = "7c80afe31cdb649e56c0d9bb5503be9166600d68a852c38dd445636d126858e5"
dependencies = [
"log",
"sqlparser_derive",
@@ -2625,9 +2615,9 @@ dependencies = [
[[package]]
name = "sqlparser_derive"
-version = "0.1.1"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55fe75cb4a364c7f7ae06c7dbbc8d84bddd85d6cdf9975963c3935bc1991761e"
+checksum = "3e9c2e1dde0efa87003e7923d94a90f46e3274ad1649f51de96812be561f041f"
dependencies = [
"proc-macro2",
"quote",
@@ -2659,14 +2649,14 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
name = "substrait"
-version = "0.19.0"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7299fc531294d189834eeaf7928482f311c0ada2cf0007948989cf75d0228183"
+checksum = "bdbe404d89610b54be889fb6540bcc6a9e234d0991cde0a8a9e341559768aa75"
dependencies = [
"git2",
"heck",
@@ -2680,7 +2670,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
- "syn 2.0.39",
+ "syn 2.0.41",
"typify",
"walkdir",
]
@@ -2704,9 +2694,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.39"
+version = "2.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
dependencies = [
"proc-macro2",
"quote",
@@ -2750,27 +2740,27 @@ dependencies = [
"fastrand",
"redox_syscall",
"rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
name = "thiserror"
-version = "1.0.50"
+version = "1.0.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2810,9 +2800,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.34.0"
+version = "1.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
dependencies = [
"backtrace",
"bytes",
@@ -2823,7 +2813,7 @@ dependencies = [
"pin-project-lite",
"socket2 0.5.5",
"tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2834,7 +2824,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2886,7 +2876,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2900,9 +2890,9 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "twox-hash"
@@ -2931,7 +2921,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
@@ -2942,9 +2932,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "typify"
-version = "0.0.14"
+version = "0.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e3b707a653e2915a2fc2c4ee96a3d30b9554b9435eb4cc8b5c6c74bbdd3044"
+checksum = "63ed4d717aa95e598e2f9183376b060e95669ef8f444701ea6afb990fde1cf69"
dependencies = [
"typify-impl",
"typify-macro",
@@ -2952,9 +2942,9 @@ dependencies = [
[[package]]
name = "typify-impl"
-version = "0.0.14"
+version = "0.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9c752192779f666e4c868672dee56a652b82c08032c7e9d23f6a845b282298"
+checksum = "89057244dfade7c58af9e62beccbcbeb7a7e7701697a33b06dbe0b7331fb79cf"
dependencies = [
"heck",
"log",
@@ -2963,16 +2953,16 @@ dependencies = [
"regress",
"schemars",
"serde_json",
- "syn 2.0.39",
+ "syn 2.0.41",
"thiserror",
"unicode-ident",
]
[[package]]
name = "typify-macro"
-version = "0.0.14"
+version = "0.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a14defd554507e72a2bb93cd081c8b374cfed43b3d986b141ad3839d9fd6986b"
+checksum = "2ddade397f5957d2cd7fb27f905a9a569db20e8e1e3ea589edce40be07b92825"
dependencies = [
"proc-macro2",
"quote",
@@ -2980,15 +2970,15 @@ dependencies = [
"serde",
"serde_json",
"serde_tokenstream",
- "syn 2.0.39",
+ "syn 2.0.41",
"typify-impl",
]
[[package]]
name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
[[package]]
name = "unicode-ident"
@@ -3025,15 +3015,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
[[package]]
name = "unsafe-libyaml"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
[[package]]
name = "untrusted"
@@ -3043,9 +3027,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
dependencies = [
"form_urlencoded",
"idna",
@@ -3054,9 +3038,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.5.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
dependencies = [
"getrandom",
"serde",
@@ -3101,9 +3085,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -3111,24 +3095,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
dependencies = [
"cfg-if",
"js-sys",
@@ -3138,9 +3122,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3148,22 +3132,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
[[package]]
name = "wasm-streams"
@@ -3180,9 +3164,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.65"
+version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -3190,9 +3174,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.25.2"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
[[package]]
name = "which"
@@ -3243,7 +3227,7 @@ version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -3252,7 +3236,16 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
]
[[package]]
@@ -3261,13 +3254,28 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
]
[[package]]
@@ -3276,42 +3284,84 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
[[package]]
name = "winreg"
version = "0.50.0"
@@ -3319,7 +3369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
"cfg-if",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3333,22 +3383,22 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.7.26"
+version = "0.7.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.41",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ba42168..08f566d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@
[package]
name = "datafusion-python"
-version = "33.0.0"
+version = "34.0.0"
homepage = "https://github.com/apache/arrow-datafusion-python"
repository = "https://github.com/apache/arrow-datafusion-python"
authors = ["Apache Arrow <de...@arrow.apache.org>"]
@@ -37,19 +37,19 @@ substrait = ["dep:datafusion-substrait"]
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync"] }
rand = "0.8"
pyo3 = { version = "0.20", features = ["extension-module", "abi3", "abi3-py38"] }
-datafusion = { version = "33.0.0", features = ["pyarrow", "avro"] }
-datafusion-common = { version = "33.0.0", features = ["pyarrow"] }
-datafusion-expr = { version = "33.0.0" }
-datafusion-optimizer = { version = "33.0.0" }
-datafusion-sql = { version = "33.0.0" }
-datafusion-substrait = { version = "33.0.0", optional = true }
+datafusion = { version = "34.0.0", features = ["pyarrow", "avro"] }
+datafusion-common = { version = "34.0.0", features = ["pyarrow"] }
+datafusion-expr = { version = "34.0.0" }
+datafusion-optimizer = { version = "34.0.0" }
+datafusion-sql = { version = "34.0.0" }
+datafusion-substrait = { version = "34.0.0", optional = true }
prost = "0.12"
prost-types = "0.12"
uuid = { version = "1.3", features = ["v4"] }
mimalloc = { version = "0.1", optional = true, default-features = false, features = ["local_dynamic_tls"] }
async-trait = "0.1"
futures = "0.3"
-object_store = { version = "0.7.0", features = ["aws", "gcp", "azure"] }
+object_store = { version = "0.8.0", features = ["aws", "gcp", "azure"] }
parking_lot = "0.12"
regex-syntax = "0.8.1"
syn = "2.0.37"
diff --git a/src/common/data_type.rs b/src/common/data_type.rs
index 9719226..03248cc 100644
--- a/src/common/data_type.rs
+++ b/src/common/data_type.rs
@@ -291,9 +291,13 @@ impl DataTypeMap {
ScalarValue::List(arr) => Ok(arr.data_type().to_owned()),
ScalarValue::Struct(_, fields) => Ok(DataType::Struct(fields.to_owned())),
ScalarValue::FixedSizeBinary(size, _) => Ok(DataType::FixedSizeBinary(*size)),
- ScalarValue::Fixedsizelist(_, field_ref, size) => {
- Ok(DataType::FixedSizeList(field_ref.to_owned(), *size))
+ ScalarValue::FixedSizeList(_array_ref) => {
+ // The FieldRef was removed from ScalarValue::FixedSizeList in
+ // https://github.com/apache/arrow-datafusion/pull/8221, so we can no
+ // longer convert back to a DataType here
+ todo!()
}
+ ScalarValue::LargeList(_) => todo!(),
ScalarValue::DurationSecond(_) => Ok(DataType::Duration(TimeUnit::Second)),
ScalarValue::DurationMillisecond(_) => Ok(DataType::Duration(TimeUnit::Millisecond)),
ScalarValue::DurationMicrosecond(_) => Ok(DataType::Duration(TimeUnit::Microsecond)),
diff --git a/src/common/schema.rs b/src/common/schema.rs
index 77b0ce2..00113a5 100644
--- a/src/common/schema.rs
+++ b/src/common/schema.rs
@@ -21,7 +21,7 @@ use datafusion::arrow::datatypes::SchemaRef;
use datafusion_expr::{Expr, TableProviderFilterPushDown, TableSource};
use pyo3::prelude::*;
-use datafusion_optimizer::utils::split_conjunction;
+use datafusion_expr::utils::split_conjunction;
use super::{data_type::DataTypeMap, function::SqlFunction};
diff --git a/src/context.rs b/src/context.rs
index fb7ca83..63c48f0 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -377,7 +377,7 @@ impl PySessionContext {
// Because create_dataframe() expects a vector of vectors of record batches
// here we need to wrap the vector of record batches in an additional vector
let batches = table.extract::<PyArrowType<Vec<RecordBatch>>>(py)?;
- let list_of_batches = PyArrowType::try_from(vec![batches.0])?;
+ let list_of_batches = PyArrowType::from(vec![batches.0]);
self.create_dataframe(list_of_batches, name, py)
})
}
diff --git a/src/dataframe.rs b/src/dataframe.rs
index ebf06f3..1e87909 100644
--- a/src/dataframe.rs
+++ b/src/dataframe.rs
@@ -36,7 +36,7 @@ use std::sync::Arc;
/// The actual execution of a plan runs natively on Rust and Arrow on a multi-threaded environment.
#[pyclass(name = "DataFrame", module = "datafusion", subclass)]
#[derive(Clone)]
-pub(crate) struct PyDataFrame {
+pub struct PyDataFrame {
df: Arc<DataFrame>,
}
diff --git a/src/dataset_exec.rs b/src/dataset_exec.rs
index 0266ad9..89f73a9 100644
--- a/src/dataset_exec.rs
+++ b/src/dataset_exec.rs
@@ -38,8 +38,8 @@ use datafusion::physical_plan::{
DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning, SendableRecordBatchStream,
Statistics,
};
+use datafusion_expr::utils::conjunction;
use datafusion_expr::Expr;
-use datafusion_optimizer::utils::conjunction;
use crate::errors::DataFusionError;
use crate::pyarrow_filter_expression::PyArrowFilterExpression;
diff --git a/src/expr.rs b/src/expr.rs
index 3875fb3..dbb56ee 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -24,10 +24,7 @@ use datafusion::scalar::ScalarValue;
use datafusion_common::DFField;
use datafusion_expr::{
col,
- expr::{
- AggregateFunction, AggregateUDF, InList, InSubquery, ScalarFunction, ScalarUDF, Sort,
- WindowFunction,
- },
+ expr::{AggregateFunction, InList, InSubquery, ScalarFunction, Sort, WindowFunction},
lit,
utils::exprlist_to_fields,
Between, BinaryExpr, Case, Cast, Expr, GetFieldAccess, GetIndexedField, Like, LogicalPlan,
@@ -283,10 +280,8 @@ impl PyExpr {
| Expr::ScalarFunction { .. }
| Expr::AggregateFunction { .. }
| Expr::WindowFunction { .. }
- | Expr::AggregateUDF { .. }
| Expr::InList { .. }
| Expr::Wildcard { .. }
- | Expr::ScalarUDF { .. }
| Expr::Exists { .. }
| Expr::InSubquery { .. }
| Expr::GroupingSet(..)
@@ -351,7 +346,8 @@ impl PyExpr {
ScalarValue::DurationMillisecond(v) => v.into_py(py),
ScalarValue::Struct(_, _) => todo!(),
ScalarValue::Dictionary(_, _) => todo!(),
- ScalarValue::Fixedsizelist(_, _, _) => todo!(),
+ ScalarValue::FixedSizeList(_) => todo!(),
+ ScalarValue::LargeList(_) => todo!(),
}),
_ => Err(py_type_err(format!(
"Non Expr::Literal encountered in types: {:?}",
@@ -391,9 +387,7 @@ impl PyExpr {
// Expr variants containing a collection of Expr(s) for operands
Expr::AggregateFunction(AggregateFunction { args, .. })
- | Expr::AggregateUDF(AggregateUDF { args, .. })
| Expr::ScalarFunction(ScalarFunction { args, .. })
- | Expr::ScalarUDF(ScalarUDF { args, .. })
| Expr::WindowFunction(WindowFunction { args, .. }) => {
Ok(args.iter().map(|arg| PyExpr::from(arg.clone())).collect())
}
@@ -480,8 +474,9 @@ impl PyExpr {
op,
right: _,
}) => format!("{op}"),
- Expr::ScalarFunction(ScalarFunction { fun, args: _ }) => format!("{fun}"),
- Expr::ScalarUDF(ScalarUDF { fun, .. }) => fun.name.clone(),
+ Expr::ScalarFunction(ScalarFunction { func_def, args: _ }) => {
+ func_def.name().to_string()
+ }
Expr::Cast { .. } => "cast".to_string(),
Expr::Between { .. } => "between".to_string(),
Expr::Case { .. } => "case".to_string(),
diff --git a/src/expr/aggregate.rs b/src/expr/aggregate.rs
index 5ebf8c6..626d92c 100644
--- a/src/expr/aggregate.rs
+++ b/src/expr/aggregate.rs
@@ -16,7 +16,7 @@
// under the License.
use datafusion_common::DataFusionError;
-use datafusion_expr::expr::{AggregateFunction, AggregateUDF, Alias};
+use datafusion_expr::expr::{AggregateFunction, Alias};
use datafusion_expr::logical_plan::Aggregate;
use datafusion_expr::Expr;
use pyo3::prelude::*;
@@ -126,10 +126,9 @@ impl PyAggregate {
match expr {
// TODO: This Alias logic seems to be returning some strange results that we should investigate
Expr::Alias(Alias { expr, .. }) => self._aggregation_arguments(expr.as_ref()),
- Expr::AggregateFunction(AggregateFunction { fun: _, args, .. })
- | Expr::AggregateUDF(AggregateUDF { fun: _, args, .. }) => {
- Ok(args.iter().map(|e| PyExpr::from(e.clone())).collect())
- }
+ Expr::AggregateFunction(AggregateFunction {
+ func_def: _, args, ..
+ }) => Ok(args.iter().map(|e| PyExpr::from(e.clone())).collect()),
_ => Err(py_type_err(
"Encountered a non Aggregate type in aggregation_arguments",
)),
@@ -139,8 +138,9 @@ impl PyAggregate {
fn _agg_func_name(expr: &Expr) -> PyResult<String> {
match expr {
Expr::Alias(Alias { expr, .. }) => Self::_agg_func_name(expr.as_ref()),
- Expr::AggregateFunction(AggregateFunction { fun, .. }) => Ok(fun.to_string()),
- Expr::AggregateUDF(AggregateUDF { fun, .. }) => Ok(fun.name.clone()),
+ Expr::AggregateFunction(AggregateFunction { func_def, .. }) => {
+ Ok(func_def.name().to_owned())
+ }
_ => Err(py_type_err(
"Encountered a non Aggregate type in agg_func_name",
)),
diff --git a/src/expr/aggregate_expr.rs b/src/expr/aggregate_expr.rs
index 1801051..04ec29a 100644
--- a/src/expr/aggregate_expr.rs
+++ b/src/expr/aggregate_expr.rs
@@ -41,7 +41,7 @@ impl From<AggregateFunction> for PyAggregateFunction {
impl Display for PyAggregateFunction {
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
let args: Vec<String> = self.aggr.args.iter().map(|expr| expr.to_string()).collect();
- write!(f, "{}({})", self.aggr.fun, args.join(", "))
+ write!(f, "{}({})", self.aggr.func_def.name(), args.join(", "))
}
}
@@ -49,7 +49,7 @@ impl Display for PyAggregateFunction {
impl PyAggregateFunction {
/// Get the aggregate type, such as "MIN", or "MAX"
fn aggregate_type(&self) -> String {
- format!("{}", self.aggr.fun)
+ self.aggr.func_def.name().to_string()
}
/// is this a distinct aggregate such as `COUNT(DISTINCT expr)`
diff --git a/src/expr/distinct.rs b/src/expr/distinct.rs
index 681ae95..5d3a0b4 100644
--- a/src/expr/distinct.rs
+++ b/src/expr/distinct.rs
@@ -44,12 +44,22 @@ impl From<Distinct> for PyDistinct {
impl Display for PyDistinct {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
- write!(
- f,
- "Distinct
+ match &self.distinct {
+ Distinct::All(input) => write!(
+ f,
+ "Distinct ALL
\nInput: {:?}",
- self.distinct.input,
- )
+ input,
+ ),
+ Distinct::On(distinct_on) => {
+ write!(
+ f,
+ "Distinct ON
+ \nInput: {:?}",
+ distinct_on.input,
+ )
+ }
+ }
}
}
@@ -71,7 +81,12 @@ impl PyDistinct {
impl LogicalNode for PyDistinct {
fn inputs(&self) -> Vec<PyLogicalPlan> {
- vec![PyLogicalPlan::from((*self.distinct.input).clone())]
+ match &self.distinct {
+ Distinct::All(input) => vec![PyLogicalPlan::from(input.as_ref().clone())],
+ Distinct::On(distinct_on) => {
+ vec![PyLogicalPlan::from(distinct_on.input.as_ref().clone())]
+ }
+ }
}
fn to_variant(&self, py: Python) -> PyResult<PyObject> {
diff --git a/src/functions.rs b/src/functions.rs
index b8c8255..d1f3e80 100644
--- a/src/functions.rs
+++ b/src/functions.rs
@@ -23,11 +23,11 @@ use crate::expr::conditional_expr::PyCaseBuilder;
use crate::expr::window::PyWindowFrame;
use crate::expr::PyExpr;
use datafusion::execution::FunctionRegistry;
-use datafusion_common::Column;
+use datafusion_common::{Column, TableReference};
use datafusion_expr::expr::Alias;
use datafusion_expr::{
aggregate_function,
- expr::{AggregateFunction, ScalarFunction, Sort, WindowFunction},
+ expr::{AggregateFunction, AggregateFunctionDefinition, ScalarFunction, Sort, WindowFunction},
lit,
window_function::find_df_window_func,
BuiltinScalarFunction, Expr,
@@ -88,8 +88,9 @@ fn order_by(expr: PyExpr, asc: Option<bool>, nulls_first: Option<bool>) -> PyRes
/// Creates a new Alias Expr
#[pyfunction]
fn alias(expr: PyExpr, name: &str) -> PyResult<PyExpr> {
+ let relation: Option<TableReference> = None;
Ok(PyExpr {
- expr: datafusion_expr::Expr::Alias(Alias::new(expr.expr, name)),
+ expr: datafusion_expr::Expr::Alias(Alias::new(expr.expr, relation, name)),
})
}
@@ -109,7 +110,9 @@ fn col(name: &str) -> PyResult<PyExpr> {
fn count_star() -> PyResult<PyExpr> {
Ok(PyExpr {
expr: Expr::AggregateFunction(AggregateFunction {
- fun: aggregate_function::AggregateFunction::Count,
+ func_def: datafusion_expr::expr::AggregateFunctionDefinition::BuiltIn(
+ aggregate_function::AggregateFunction::Count,
+ ),
args: vec![lit(1)],
distinct: false,
filter: None,
@@ -181,7 +184,9 @@ macro_rules! scalar_function {
#[pyo3(signature = (*args))]
fn $NAME(args: Vec<PyExpr>) -> PyExpr {
let expr = datafusion_expr::Expr::ScalarFunction(ScalarFunction {
- fun: BuiltinScalarFunction::$FUNC,
+ func_def: datafusion_expr::ScalarFunctionDefinition::BuiltIn(
+ BuiltinScalarFunction::$FUNC,
+ ),
args: args.into_iter().map(|e| e.into()).collect(),
});
expr.into()
@@ -199,7 +204,9 @@ macro_rules! aggregate_function {
#[pyo3(signature = (*args, distinct=false))]
fn $NAME(args: Vec<PyExpr>, distinct: bool) -> PyExpr {
let expr = datafusion_expr::Expr::AggregateFunction(AggregateFunction {
- fun: datafusion_expr::aggregate_function::AggregateFunction::$FUNC,
+ func_def: AggregateFunctionDefinition::BuiltIn(
+ datafusion_expr::aggregate_function::AggregateFunction::$FUNC,
+ ),
args: args.into_iter().map(|e| e.into()).collect(),
distinct,
filter: None,
diff --git a/src/udaf.rs b/src/udaf.rs
index 596ed69..5c43b67 100644
--- a/src/udaf.rs
+++ b/src/udaf.rs
@@ -172,6 +172,6 @@ impl PyAggregateUDF {
}
fn __repr__(&self) -> PyResult<String> {
- Ok(format!("AggregateUDF({})", self.function.name))
+ Ok(format!("AggregateUDF({})", self.function.name()))
}
}
diff --git a/src/udf.rs b/src/udf.rs
index bba8ae5..af17b57 100644
--- a/src/udf.rs
+++ b/src/udf.rs
@@ -95,6 +95,6 @@ impl PyScalarUDF {
}
fn __repr__(&self) -> PyResult<String> {
- Ok(format!("ScalarUDF({})", self.function.name))
+ Ok(format!("ScalarUDF({})", self.function.name()))
}
}