diff --git a/Cargo.toml b/Cargo.toml index c65d9b3560b4..c01654790e9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ members = [ ] [workspace.package] -version = "21.0.0" +version = "21.1.0" edition = "2021" readme = "README.md" authors = ["Apache Arrow "] diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 7487aef3a6f1..1f1d9792d050 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -18,7 +18,7 @@ [package] name = "datafusion-benchmarks" description = "DataFusion Benchmarks" -version = "21.0.0" +version = "21.1.0" edition = "2021" authors = ["Apache Arrow "] homepage = "https://github.com/apache/arrow-datafusion" @@ -34,7 +34,7 @@ snmalloc = ["snmalloc-rs"] [dependencies] arrow = { workspace = true } -datafusion = { path = "../datafusion/core", version = "21.0.0", features = ["scheduler"] } +datafusion = { path = "../datafusion/core", version = "21.1.0", features = ["scheduler"] } env_logger = "0.10" futures = "0.3" mimalloc = { version = "0.1", optional = true, default-features = false } @@ -48,4 +48,4 @@ test-utils = { path = "../test-utils/", version = "0.1.0" } tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread", "parking_lot"] } [dev-dependencies] -datafusion-proto = { path = "../datafusion/proto", version = "21.0.0" } +datafusion-proto = { path = "../datafusion/proto", version = "21.1.0" } diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index c794b4cb2291..ea3fb1cb8f96 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -301,7 +301,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -659,7 +659,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -676,7 +676,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -694,7 +694,7 @@ dependencies = [ [[package]] name = "datafusion" -version = "21.0.0" +version = "21.1.0" dependencies = [ "ahash", "arrow", @@ -740,7 +740,7 @@ dependencies = [ [[package]] name = "datafusion-cli" -version = "21.0.0" +version = "21.1.0" dependencies = [ "arrow", "async-trait", @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "21.0.0" +version = "21.1.0" dependencies = [ "arrow", "arrow-array", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "datafusion-execution" -version = "21.0.0" +version = "21.1.0" dependencies = [ "dashmap", "datafusion-common", @@ -787,7 +787,7 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "21.0.0" +version = "21.1.0" dependencies = [ "ahash", "arrow", @@ -797,7 +797,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "21.0.0" +version = "21.1.0" dependencies = [ "arrow", "async-trait", @@ -813,7 +813,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "21.0.0" +version = "21.1.0" dependencies = [ "ahash", "arrow", @@ -843,7 +843,7 @@ dependencies = [ [[package]] name = "datafusion-row" -version = "21.0.0" +version = "21.1.0" dependencies = [ "arrow", "datafusion-common", @@ -853,7 +853,7 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "21.0.0" +version = "21.1.0" dependencies = [ "arrow-schema", "datafusion-common", @@ -1048,9 +1048,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1063,9 +1063,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1073,15 +1073,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1090,38 +1090,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.12", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1315,9 +1315,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.55" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716f12fbcfac6ffab0a5e9ec51d0a0ff70503742bb2dc7b99396394c9dc323f0" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1525,9 +1525,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -2275,7 +2275,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -2454,9 +2454,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" dependencies = [ "proc-macro2", "quote", @@ -2508,7 +2508,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -2572,7 +2572,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.12", ] [[package]] @@ -2909,11 +2909,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.47.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2649ff315bee4c98757f15dac226efe3d81927adbb6e882084bb1ee3e0c330a7" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows-targets 0.47.0", + "windows-targets", ] [[package]] @@ -2922,7 +2922,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -2931,28 +2931,13 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f8996d3f43b4b2d44327cd71b7b0efd1284ab60e6e9d0e8b630e18555d87d3e" -dependencies = [ - "windows_aarch64_gnullvm 0.47.0", - "windows_aarch64_msvc 0.47.0", - "windows_i686_gnu 0.47.0", - "windows_i686_msvc 0.47.0", - "windows_x86_64_gnu 0.47.0", - "windows_x86_64_gnullvm 0.47.0", - "windows_x86_64_msvc 0.47.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -2961,84 +2946,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" -[[package]] -name = "windows_aarch64_msvc" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf" - [[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" -[[package]] -name = "windows_i686_gnu" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3" - [[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" -[[package]] -name = "windows_i686_msvc" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" -[[package]] -name = "windows_x86_64_gnu" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acaa0c2cf0d2ef99b61c308a0c3dbae430a51b7345dedec470bd8f53f5a3642" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" -[[package]] -name = "windows_x86_64_msvc" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7" - [[package]] name = "winreg" version = "0.10.1" diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml index 3fae0ed3661d..f1758f49d1b5 100644 --- a/datafusion-cli/Cargo.toml +++ b/datafusion-cli/Cargo.toml @@ -18,7 +18,7 @@ [package] name = "datafusion-cli" description = "Command Line Client for DataFusion query engine." -version = "21.0.0" +version = "21.1.0" authors = ["Apache Arrow "] edition = "2021" keywords = ["arrow", "datafusion", "query", "sql"] @@ -32,7 +32,7 @@ readme = "README.md" arrow = "36.0.0" async-trait = "0.1.41" clap = { version = "3", features = ["derive", "cargo"] } -datafusion = { path = "../datafusion/core", version = "21.0.0" } +datafusion = { path = "../datafusion/core", version = "21.1.0" } dirs = "4.0.0" env_logger = "0.9" mimalloc = { version = "0.1", default-features = false } diff --git a/datafusion/CHANGELOG.md b/datafusion/CHANGELOG.md index 042792fe95f3..017ec30ea1c0 100644 --- a/datafusion/CHANGELOG.md +++ b/datafusion/CHANGELOG.md @@ -19,6 +19,16 @@ # Changelog +## [21.1.0](https://github.com/apache/arrow-datafusion/tree/21.1.0) (2023-03-24) + +[Full Changelog](https://github.com/apache/arrow-datafusion/compare/21.0.0...21.1.0) + + +**Fixed bugs:** + +- fix: Use consistent arrow version (do not use both `arrow 34.0.0` and `arrow-array 35.0.0`) [#5765](https://github.com/apache/arrow-datafusion/pull/5765) + + ## [21.0.0](https://github.com/apache/arrow-datafusion/tree/21.0.0) (2023-03-24) [Full Changelog](https://github.com/apache/arrow-datafusion/compare/20.0.0...21.0.0) diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index d0099b330c53..f168bdcc6a69 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -67,14 +67,14 @@ bytes = "1.4" bzip2 = { version = "0.4.3", optional = true } chrono = { version = "0.4.23", default-features = false } dashmap = "5.4.0" -datafusion-common = { path = "../common", version = "21.0.0", features = ["parquet", "object_store"] } -datafusion-execution = { path = "../execution", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } -datafusion-jit = { path = "../jit", version = "21.0.0", optional = true } -datafusion-optimizer = { path = "../optimizer", version = "21.0.0", default-features = false } -datafusion-physical-expr = { path = "../physical-expr", version = "21.0.0", default-features = false } -datafusion-row = { path = "../row", version = "21.0.0" } -datafusion-sql = { path = "../sql", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0", features = ["parquet", "object_store"] } +datafusion-execution = { path = "../execution", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } +datafusion-jit = { path = "../jit", version = "21.1.0", optional = true } +datafusion-optimizer = { path = "../optimizer", version = "21.1.0", default-features = false } +datafusion-physical-expr = { path = "../physical-expr", version = "21.1.0", default-features = false } +datafusion-row = { path = "../row", version = "21.1.0" } +datafusion-sql = { path = "../sql", version = "21.1.0" } flate2 = { version = "1.0.24", optional = true } futures = "0.3" glob = "0.3.0" diff --git a/datafusion/execution/Cargo.toml b/datafusion/execution/Cargo.toml index 7957b6bf0136..9e92e7ab8f47 100644 --- a/datafusion/execution/Cargo.toml +++ b/datafusion/execution/Cargo.toml @@ -34,8 +34,8 @@ path = "src/lib.rs" [dependencies] dashmap = "5.4.0" -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } hashbrown = { version = "0.13", features = ["raw"] } log = "^0.4" object_store = "0.5.4" diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml index 7ca2dd74d6fb..4f8c2bb05bdc 100644 --- a/datafusion/expr/Cargo.toml +++ b/datafusion/expr/Cargo.toml @@ -37,7 +37,7 @@ path = "src/lib.rs" [dependencies] ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] } arrow = { workspace = true } -datafusion-common = { path = "../common", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0" } sqlparser = "0.32" [dev-dependencies] diff --git a/datafusion/jit/Cargo.toml b/datafusion/jit/Cargo.toml index dd7bc3c6a6c0..e6694a35e405 100644 --- a/datafusion/jit/Cargo.toml +++ b/datafusion/jit/Cargo.toml @@ -41,7 +41,7 @@ cranelift = "0.89.0" cranelift-jit = "0.89.0" cranelift-module = "0.89.0" cranelift-native = "0.89.0" -datafusion-common = { path = "../common", version = "21.0.0", features = ["jit"] } -datafusion-expr = { path = "../expr", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0", features = ["jit"] } +datafusion-expr = { path = "../expr", version = "21.1.0" } parking_lot = "0.12" diff --git a/datafusion/optimizer/Cargo.toml b/datafusion/optimizer/Cargo.toml index 9887292f72e8..b86de81aa590 100644 --- a/datafusion/optimizer/Cargo.toml +++ b/datafusion/optimizer/Cargo.toml @@ -43,9 +43,9 @@ unicode_expressions = ["datafusion-physical-expr/unicode_expressions"] arrow = { workspace = true } async-trait = "0.1.41" chrono = { version = "0.4.23", default-features = false } -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } -datafusion-physical-expr = { path = "../physical-expr", version = "21.0.0", default-features = false } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } +datafusion-physical-expr = { path = "../physical-expr", version = "21.1.0", default-features = false } hashbrown = { version = "0.13", features = ["raw"] } itertools = "0.10" log = "^0.4" @@ -53,5 +53,5 @@ regex-syntax = "0.6.28" [dev-dependencies] ctor = "0.2.0" -datafusion-sql = { path = "../sql", version = "21.0.0" } +datafusion-sql = { path = "../sql", version = "21.1.0" } env_logger = "0.10.0" diff --git a/datafusion/physical-expr/Cargo.toml b/datafusion/physical-expr/Cargo.toml index 28bfc4ffa2a5..1d0152d49abe 100644 --- a/datafusion/physical-expr/Cargo.toml +++ b/datafusion/physical-expr/Cargo.toml @@ -50,9 +50,9 @@ arrow-schema = { workspace = true } blake2 = { version = "^0.10.2", optional = true } blake3 = { version = "1.0", optional = true } chrono = { version = "0.4.23", default-features = false } -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } -datafusion-row = { path = "../row", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } +datafusion-row = { path = "../row", version = "21.1.0" } half = { version = "2.1", default-features = false } hashbrown = { version = "0.13", features = ["raw"] } indexmap = "1.9.2" diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml index f174aa90d594..d68d27cd7253 100644 --- a/datafusion/proto/Cargo.toml +++ b/datafusion/proto/Cargo.toml @@ -42,9 +42,9 @@ json = ["pbjson", "serde", "serde_json"] [dependencies] arrow = { workspace = true } chrono = { version = "0.4", default-features = false } -datafusion = { path = "../core", version = "21.0.0" } -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } +datafusion = { path = "../core", version = "21.1.0" } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } object_store = { version = "0.5.4" } pbjson = { version = "0.5", optional = true } prost = "0.11.0" diff --git a/datafusion/row/Cargo.toml b/datafusion/row/Cargo.toml index 092bdedd91c7..2d44d308c758 100644 --- a/datafusion/row/Cargo.toml +++ b/datafusion/row/Cargo.toml @@ -38,7 +38,7 @@ jit = ["datafusion-jit"] [dependencies] arrow = { workspace = true } -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-jit = { path = "../jit", version = "21.0.0", optional = true } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-jit = { path = "../jit", version = "21.1.0", optional = true } paste = "^1.0" rand = "0.8" diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml index 62b706b912eb..04b81b7eff22 100644 --- a/datafusion/sql/Cargo.toml +++ b/datafusion/sql/Cargo.toml @@ -38,8 +38,8 @@ unicode_expressions = [] [dependencies] arrow-schema = { workspace = true } -datafusion-common = { path = "../common", version = "21.0.0" } -datafusion-expr = { path = "../expr", version = "21.0.0" } +datafusion-common = { path = "../common", version = "21.1.0" } +datafusion-expr = { path = "../expr", version = "21.1.0" } log = "^0.4" sqlparser = "0.32" diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml index 4485120df802..3a9dafc9c603 100644 --- a/datafusion/substrait/Cargo.toml +++ b/datafusion/substrait/Cargo.toml @@ -30,7 +30,7 @@ rust-version = { workspace = true } [dependencies] async-recursion = "1.0" chrono = "0.4.23" -datafusion = { version = "21.0.0", path = "../core" } +datafusion = { version = "21.1.0", path = "../core" } itertools = "0.10.5" object_store = "0.5.4" prost = "0.11" diff --git a/dev/update_datafusion_versions.py b/dev/update_datafusion_versions.py index ea5c89068ad0..f61395a007c8 100755 --- a/dev/update_datafusion_versions.py +++ b/dev/update_datafusion_versions.py @@ -44,6 +44,22 @@ 'datafusion-examples': 'datafusion-examples/Cargo.toml', } +def update_workspace_version(new_version: str): + cargo_toml = 'Cargo.toml' + print(f'updating {cargo_toml}') + with open(cargo_toml) as f: + data = f.read() + + doc = tomlkit.parse(data) + pkg = doc.get('workspace').get('package') + + print('workspace pacakge', pkg) + pkg['version'] = new_version + + with open(cargo_toml, 'w') as f: + f.write(tomlkit.dumps(doc)) + + def update_datafusion_version(cargo_toml: str, new_version: str): print(f'updating {cargo_toml}') with open(cargo_toml) as f: @@ -57,7 +73,6 @@ def update_datafusion_version(cargo_toml: str, new_version: str): with open(cargo_toml, 'w') as f: f.write(tomlkit.dumps(doc)) - def update_downstream_versions(cargo_toml: str, new_version: str): with open(cargo_toml) as f: data = f.read() @@ -101,6 +116,9 @@ def main(): new_version = args.new_version repo_root = Path(__file__).parent.parent.absolute() + print(f'Updating workspace in {repo_root} to {new_version}') + update_workspace_version(new_version) + print(f'Updating datafusion crate versions in {repo_root} to {new_version}') for cargo_toml in crates.values(): update_datafusion_version(cargo_toml, new_version)