diff --git a/Cargo.lock b/Cargo.lock index 9c1e50b48..f40947700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,9 +141,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a8801ebb147ad240b2d978d3ab9f73c9ccd4557ba6a03e7800496770ed10e0" +checksum = "7fab9e93ba8ce88a37d5a30dce4b9913b75413dc1ac56cb5d72e5a840543f829" dependencies = [ "ahash", "arrow-arith", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895263144bd4a69751cbe6a34a53f26626e19770b313a9fa792c415cd0e78f11" +checksum = "bc1d4e368e87ad9ee64f28b9577a3834ce10fe2703a26b28417d485bbbdff956" dependencies = [ "arrow-array", "arrow-buffer", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226fdc6c3a4ae154a74c24091d36a90b514f0ed7112f5b8322c1d8f354d8e20d" +checksum = "d02efa7253ede102d45a4e802a129e83bcc3f49884cab795b1ac223918e4318d" dependencies = [ "ahash", "arrow-buffer", @@ -196,9 +196,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4843af4dd679c2f35b69c572874da8fde33be53eb549a5fb128e7a4b763510" +checksum = "fda119225204141138cb0541c692fbfef0e875ba01bfdeaed09e9d354f9d6195" dependencies = [ "bytes", "half 2.2.1", @@ -207,9 +207,9 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e8b9990733a9b635f656efda3c9b8308c7a19695c9ec2c7046dd154f9b144b" +checksum = "1d825d51b9968868d50bc5af92388754056796dbc62a4e25307d588a1fc84dee" dependencies = [ "arrow-array", "arrow-buffer", @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "646fbb4e11dd0afb8083e883f53117713b8caadb4413b3c9e63e3f535da3683c" +checksum = "43ef855dc6b126dc197f43e061d4de46b9d4c033aa51c2587657f7508242cef1" dependencies = [ "arrow-array", "arrow-buffer", @@ -244,9 +244,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da900f31ff01a0a84da0572209be72b2b6f980f3ea58803635de47913191c188" +checksum = "475a4c3699c8b4095ca61cecf15da6f67841847a5f5aac983ccb9a377d02f73a" dependencies = [ "arrow-buffer", "arrow-schema", @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2707a8d7ee2d345d045283ece3ae43416175873483e5d96319c929da542a0b1f" +checksum = "1248005c8ac549f869b7a840859d942bf62471479c1a2d82659d453eebcd166a" dependencies = [ "arrow-array", "arrow-buffer", @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1b91a63c356d14eedc778b76d66a88f35ac8498426bb0799a769a49a74a8b4" +checksum = "f03d7e3b04dd688ccec354fe449aed56b831679f03e44ee2c1cfc4045067b69c" dependencies = [ "arrow-array", "arrow-buffer", @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584325c91293abbca7aaaabf8da9fe303245d641f5f4a18a6058dc68009c7ebf" +checksum = "03b87aa408ea6a6300e49eb2eba0c032c88ed9dc19e0a9948489c55efdca71f4" dependencies = [ "arrow-array", "arrow-buffer", @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e32afc1329f7b372463b21c6ca502b07cf237e1ed420d87706c1770bb0ebd38" +checksum = "114a348ab581e7c9b6908fcab23cb39ff9f060eb19e72b13f8fb8eaa37f65d22" dependencies = [ "ahash", "arrow-array", @@ -320,19 +320,20 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b104f5daa730f00fde22adc03a12aa5a2ae9ccbbf99cbd53d284119ddc90e03d" +checksum = "5d1d179c117b158853e0101bfbed5615e86fe97ee356b4af901f1c5001e1ce4b" dependencies = [ "bitflags 2.1.0", ] [[package]] name = "arrow-select" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b3ca55356d1eae07cf48808d8c462cea674393ae6ad1e0b120f40b422eb2b4" +checksum = "d5c71e003202e67e9db139e5278c79f5520bb79922261dfe140e4637ee8b6108" dependencies = [ + "ahash", "arrow-array", "arrow-buffer", "arrow-data", @@ -342,9 +343,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1433ce02590cae68da0a18ed3a3ed868ffac2c6f24c533ddd2067f7ee04b4a" +checksum = "c4cebbb282d6b9244895f4a9a912e55e57bce112554c7fa91fcec5459cb421ab" dependencies = [ "arrow-array", "arrow-buffer", @@ -1232,8 +1233,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7014432223f4d721cb9786cd88bb89e7464e0ba984d4a7f49db7787f5f268674" dependencies = [ "ahash", "arrow", @@ -1279,12 +1281,17 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3903ed8f102892f17b48efa437f3542159241d41c564f0d1e78efdc5e663aa" dependencies = [ + "ahash", "arrow", "arrow-array", + "arrow-buffer", + "arrow-schema", "chrono", + "half 2.2.1", "num_cpus", "object_store", "parquet", @@ -1294,8 +1301,9 @@ dependencies = [ [[package]] name = "datafusion-execution" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780b73b2407050e53f51a9781868593f694102c59e622de9a8aafc0343c4f237" dependencies = [ "arrow", "chrono", @@ -1314,8 +1322,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c382676338d8caba6c027ba0da47260f65ffedab38fda78f6d8043f607557c" dependencies = [ "ahash", "arrow", @@ -1328,8 +1337,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2904a432f795484fd45e29ded4537152adb60f636c05691db34fcd94c92c96" dependencies = [ "arrow", "async-trait", @@ -1345,8 +1355,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b4968e9a998dc0476c4db7a82f280e2026b25f464e4aa0c3bb9807ee63ddfd" dependencies = [ "ahash", "arrow", @@ -1378,8 +1389,9 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd0d1fe54e37a47a2d58a1232c22786f2c28ad35805fdcd08f0253a8b0aaa90" dependencies = [ "ahash", "arrow", @@ -1408,8 +1420,9 @@ dependencies = [ [[package]] name = "datafusion-proto" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca1db9605e1f545b852fa9dd05f03339b333c9f2814a4e33b9ac7e9e586a1014" dependencies = [ "arrow", "chrono", @@ -1417,13 +1430,14 @@ dependencies = [ "datafusion-common", "datafusion-expr", "object_store", - "prost", + "prost 0.12.1", ] [[package]] name = "datafusion-sql" -version = "31.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=d19e9d684bbe1fd820674d48a96795bfbea9db7d#d19e9d684bbe1fd820674d48a96795bfbea9db7d" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b568d44c87ead99604d704f942e257c8a236ee1bbf890ee3e034ad659dcb2c21" dependencies = [ "arrow", "arrow-schema", @@ -2728,9 +2742,9 @@ dependencies = [ [[package]] name = "parquet" -version = "46.0.0" +version = "47.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad2cba786ae07da4d73371a88b9e0f9d3ffac1a9badc83922e0e15814f5c5fa" +checksum = "0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d" dependencies = [ "ahash", "arrow-array", @@ -3004,7 +3018,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.8", +] + +[[package]] +name = "prost" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +dependencies = [ + "bytes", + "prost-derive 0.12.1", ] [[package]] @@ -3021,7 +3045,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost", + "prost 0.11.8", "prost-types", "regex", "syn 1.0.109", @@ -3042,13 +3066,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.31", +] + [[package]] name = "prost-types" version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" dependencies = [ - "prost", + "prost 0.11.8", ] [[package]] @@ -4096,7 +4133,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.11.8", "rustls-pemfile", "tokio", "tokio-rustls 0.24.0", @@ -4370,7 +4407,7 @@ dependencies = [ "num-complex", "ordered-float 3.6.0", "petgraph", - "prost", + "prost 0.11.8", "prost-build", "prost-types", "protobuf-src", @@ -4433,7 +4470,7 @@ dependencies = [ "deterministic-hash", "env_logger", "log", - "prost", + "prost 0.11.8", "pyo3", "pythonize", "serde", @@ -4476,7 +4513,7 @@ dependencies = [ "lru", "num-traits", "ordered-float 3.6.0", - "prost", + "prost 0.11.8", "prost-types", "regex", "reqwest", @@ -4507,7 +4544,7 @@ dependencies = [ "futures-util", "h2", "predicates", - "prost", + "prost 0.11.8", "prost-build", "protobuf-src", "regex", @@ -4562,7 +4599,7 @@ dependencies = [ "getrandom", "indexmap 1.9.3", "js-sys", - "prost", + "prost 0.11.8", "prost-types", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 57a6d8030..fa4ef16d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,28 +14,19 @@ members = [ ] [workspace.dependencies] -arrow = { version = "46.0.0", default_features = false } +arrow = { version = "47.0.0", default_features = false } sqlparser = { version = "0.37.0" } chrono = { version = "0.4.31", default_features = false } reqwest = { version = "=0.11.13", default-features = false } tokio = { version = "1.32.0" } pyo3 = { version = "0.19" } -# # Once datafusion 32.0.0 is released -#datafusion = { version = "32.0.0" } -#datafusion-common = { version = "32.0.0", default_features = false} -#datafusion-expr = { version = "32.0.0" } -#datafusion-proto = { version = "32.0.0" } -#datafusion-physical-expr = { version = "32.0.0" } -#datafusion-optimizer = { version = "32.0.0" } - -# # Git dependencies for development -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d" } -datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d", default_features = false} -datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d" } -datafusion-proto = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d" } -datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d" } -datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "d19e9d684bbe1fd820674d48a96795bfbea9db7d" } +datafusion = { version = "32.0.0" } +datafusion-common = { version = "32.0.0", default_features = false} +datafusion-expr = { version = "32.0.0" } +datafusion-proto = { version = "32.0.0" } +datafusion-physical-expr = { version = "32.0.0" } +datafusion-optimizer = { version = "32.0.0" } [profile.release] ## Tell `rustc` to use highest performance optimization and perform Link Time Optimization diff --git a/vegafusion-wasm/package-lock.json b/vegafusion-wasm/package-lock.json index eb0e6d475..b4613e524 100644 --- a/vegafusion-wasm/package-lock.json +++ b/vegafusion-wasm/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "vegafusion-wasm", - "version": "1.4.0", + "version": "1.4.1", "license": "BSD-3-Clause", "dependencies": { "bootstrap": "^5.1.3", @@ -1344,4 +1344,4 @@ } } } -} \ No newline at end of file +} diff --git a/vegafusion-wasm/src/lib.rs b/vegafusion-wasm/src/lib.rs index 074e7531d..89e8ca7f3 100644 --- a/vegafusion-wasm/src/lib.rs +++ b/vegafusion-wasm/src/lib.rs @@ -190,7 +190,7 @@ impl MsgReceiver { if self.verbose { log(&format!("VegaFusion(wasm): Received {}", var.name)); log(&serde_json::to_string_pretty(&json).unwrap()); - log(&format!("DataType: {:#?}", &value.get_datatype())); + log(&format!("DataType: {:#?}", &value.data_type())); } let js_value =