diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index decca7346a3ee..b0ece3f922edb 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -57,16 +57,18 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdc4456252b8108b914f41450a754d23b8d21299322f24f81fc46a834fa0293" +checksum = "a5f89d2bc04fa746ee395d20c4cbfa508e4cce5c00bae816f0fae434fcfb9853" dependencies = [ + "ahash", "bitflags", "chrono", "comfy-table", "csv", "flatbuffers", "half", + "hashbrown", "hex", "indexmap", "lazy_static", @@ -343,14 +345,14 @@ dependencies = [ [[package]] name = "datafusion" -version = "9.0.0" +version = "10.0.0" dependencies = [ "ahash", "arrow", "async-trait", + "bytes", "chrono", "datafusion-common", - "datafusion-data-access", "datafusion-expr", "datafusion-optimizer", "datafusion-physical-expr", @@ -358,11 +360,12 @@ dependencies = [ "datafusion-sql", "futures", "glob", - "hashbrown 0.12.1", + "hashbrown", "itertools", "lazy_static", "log", "num_cpus", + "object_store", "ordered-float 3.0.0", "parking_lot", "parquet", @@ -380,7 +383,7 @@ dependencies = [ [[package]] name = "datafusion-cli" -version = "9.0.0" +version = "10.0.0" dependencies = [ "arrow", "clap", @@ -394,29 +397,18 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "9.0.0" +version = "10.0.0" dependencies = [ "arrow", + "object_store", "ordered-float 3.0.0", "parquet", "sqlparser", ] -[[package]] -name = "datafusion-data-access" -version = "9.0.0" -dependencies = [ - "async-trait", - "chrono", - "futures", - "parking_lot", - "tempfile", - "tokio", -] - [[package]] name = "datafusion-expr" -version = "9.0.0" +version = "10.0.0" dependencies = [ "ahash", "arrow", @@ -426,7 +418,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "9.0.0" +version = "10.0.0" dependencies = [ "arrow", "async-trait", @@ -434,13 +426,13 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown 0.12.1", + "hashbrown", "log", ] [[package]] name = "datafusion-physical-expr" -version = "9.0.0" +version = "10.0.0" dependencies = [ "ahash", "arrow", @@ -450,7 +442,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-row", - "hashbrown 0.12.1", + "hashbrown", "lazy_static", "md-5", "ordered-float 3.0.0", @@ -463,7 +455,7 @@ dependencies = [ [[package]] name = "datafusion-row" -version = "9.0.0" +version = "10.0.0" dependencies = [ "arrow", "datafusion-common", @@ -473,13 +465,13 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "9.0.0" +version = "10.0.0" dependencies = [ "ahash", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown 0.12.1", + "hashbrown", "sqlparser", "tokio", ] @@ -536,6 +528,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "either" version = "1.6.1" @@ -761,15 +759,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.11.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "c207b0ee023c7fce79daf01828163aaf53a1ddd0be8b1ef9541da7d41f6fa63a" [[package]] name = "hashbrown" @@ -820,12 +812,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -1185,6 +1177,25 @@ dependencies = [ "libc", ] +[[package]] +name = "object_store" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "857af043f5d9f36ed4f71815857f79b841412dda1cf0ca5a29608874f6f038e2" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "itertools", + "percent-encoding", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + [[package]] name = "once_cell" version = "1.12.0" @@ -1240,9 +1251,9 @@ dependencies = [ [[package]] name = "parquet" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11444503e702853d52a612828e238a8d0072f85f9a0427b5e2009da4ce61594" +checksum = "65f61759af307fad711e7656c705218402a8a79b776c893c20fef96e8ffd2a7d" dependencies = [ "arrow", "base64", @@ -1251,6 +1262,7 @@ dependencies = [ "bytes", "chrono", "flate2", + "futures", "lz4", "num", "num-bigint", @@ -1258,6 +1270,7 @@ dependencies = [ "rand", "snap", "thrift", + "tokio", "zstd", ] @@ -1484,6 +1497,15 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -1542,6 +1564,28 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +[[package]] +name = "snafu" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "snap" version = "1.0.5" @@ -1703,6 +1747,8 @@ version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ + "bytes", + "memchr", "num_cpus", "once_cell", "parking_lot", @@ -1732,6 +1778,38 @@ dependencies = [ "tokio", ] +[[package]] +name = "tracing" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +dependencies = [ + "once_cell", +] + [[package]] name = "typenum" version = "1.15.0" @@ -1804,6 +1882,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" diff --git a/dev/release/README.md b/dev/release/README.md index 137e46a912655..222f5f3432e3c 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -277,7 +277,6 @@ of the following crates: - [datafusion](https://crates.io/crates/datafusion) - [datafusion-cli](https://crates.io/crates/datafusion-cli) - [datafusion-common](https://crates.io/crates/datafusion-common) -- [datafusion-data-access](https://crates.io/crates/datafusion-data-access) - [datafusion-expr](https://crates.io/crates/datafusion-expr) - [datafusion-jit](https://crates.io/crates/datafusion-jit) - [datafusion-physical-expr](https://crates.io/crates/datafusion-physical-expr) @@ -299,7 +298,6 @@ dot -Tsvg dev/release/crate-deps.dot > dev/release/crate-deps.svg ``` ```shell -(cd datafusion/data-access && cargo publish) (cd datafusion/common && cargo publish) (cd datafusion/expr && cargo publish) (cd datafusion/sql && cargo publish) @@ -345,7 +343,6 @@ We have published new versions of DataFusion to crates.io: https://crates.io/crates/datafusion/8.0.0 https://crates.io/crates/datafusion-cli/8.0.0 https://crates.io/crates/datafusion-common/8.0.0 -https://crates.io/crates/datafusion-data-access/8.0.0 https://crates.io/crates/datafusion-expr/8.0.0 https://crates.io/crates/datafusion-jit/8.0.0 https://crates.io/crates/datafusion-optimizer/8.0.0 diff --git a/dev/release/crate-deps.dot b/dev/release/crate-deps.dot index 1a3cbbc6fba73..e01525ae8bace 100644 --- a/dev/release/crate-deps.dot +++ b/dev/release/crate-deps.dot @@ -19,8 +19,6 @@ digraph G { datafusion_common - datafusion_data_access - datafusion_expr -> datafusion_common datafusion_sql -> datafusion_common @@ -39,7 +37,6 @@ digraph G { datafusion_row -> datafusion_jit datafusion -> datafusion_common - datafusion -> datafusion_data_access datafusion -> datafusion_expr datafusion -> datafusion_jit datafusion -> datafusion_optimizer diff --git a/dev/release/crate-deps.svg b/dev/release/crate-deps.svg index 3a5e90365b21b..045aad42edabb 100644 --- a/dev/release/crate-deps.svg +++ b/dev/release/crate-deps.svg @@ -4,25 +4,19 @@ - + G - + datafusion_common datafusion_common - - -datafusion_data_access - -datafusion_data_access - - + datafusion_expr datafusion_expr @@ -34,7 +28,7 @@ - + datafusion_sql datafusion_sql @@ -52,7 +46,7 @@ - + datafusion_optimizer datafusion_optimizer @@ -70,7 +64,7 @@ - + datafusion_physical_expr datafusion_physical_expr @@ -88,7 +82,7 @@ - + datafusion_jit datafusion_jit @@ -106,7 +100,7 @@ - + datafusion_row datafusion_row @@ -124,82 +118,76 @@ - + datafusion - -datafusion + +datafusion datafusion->datafusion_common - - - - - -datafusion->datafusion_data_access - - + + - + datafusion->datafusion_expr - - + + - + datafusion->datafusion_sql - - + + - + datafusion->datafusion_optimizer - - + + - + datafusion->datafusion_physical_expr - - + + - + datafusion->datafusion_jit - - + + - + datafusion->datafusion_row - - + + - + datafusion_proto - -datafusion_proto + +datafusion_proto - + datafusion_proto->datafusion - - + + - + datafusion_cli - -datafusion_cli + +datafusion_cli - + datafusion_cli->datafusion - - + + diff --git a/dev/update_datafusion_versions.py b/dev/update_datafusion_versions.py index 33bde5e9e3c85..d85dbb8f0b0dd 100755 --- a/dev/update_datafusion_versions.py +++ b/dev/update_datafusion_versions.py @@ -32,7 +32,6 @@ 'datafusion': 'datafusion/core/Cargo.toml', 'datafusion-cli': 'datafusion-cli/Cargo.toml', 'datafusion-common': 'datafusion/common/Cargo.toml', - 'datafusion-data-access': 'datafusion/data-access/Cargo.toml', 'datafusion-expr': 'datafusion/expr/Cargo.toml', 'datafusion-jit': 'datafusion/jit/Cargo.toml', 'datafusion-optimizer': 'datafusion/optimizer/Cargo.toml',