From 8cb5b111854732d65f83df138c1c9b3465dd6c39 Mon Sep 17 00:00:00 2001 From: jiacai2050 Date: Mon, 26 Jun 2023 08:08:28 +0800 Subject: [PATCH] chore: bump rust client --- Cargo.lock | 160 +++++++++++++------------------------------- rust-toolchain | 1 - rust-toolchain.toml | 3 + 3 files changed, 50 insertions(+), 114 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/Cargo.lock b/Cargo.lock index 1c12143f3a..dd397a2d26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ version = "1.2.2" dependencies = [ "arc-swap 1.6.0", "arena", - "arrow 38.0.0", + "arrow", "async-stream", "async-trait", "base64 0.13.1", @@ -184,31 +184,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -[[package]] -name = "arrow" -version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedc767fbaa36ea50f086215f54f1a007d22046fc4754b0448c657bcbe9f8413" -dependencies = [ - "ahash 0.8.3", - "arrow-buffer 23.0.0", - "bitflags", - "chrono", - "csv", - "flatbuffers 2.1.2", - "half 2.2.1", - "hashbrown 0.12.3", - "indexmap", - "lazy_static", - "lexical-core 0.8.5", - "multiversion", - "num", - "regex", - "regex-syntax 0.6.29", - "serde", - "serde_json", -] - [[package]] name = "arrow" version = "38.0.0" @@ -218,7 +193,7 @@ dependencies = [ "ahash 0.8.3", "arrow-arith", "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-cast", "arrow-csv", "arrow-data", @@ -238,7 +213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace6aa3d5617c5d03041a05e01c6819428a8ddf49dd0b055df9b40fef9d96094" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "chrono", @@ -253,7 +228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "104a04520692cc674e6afd7682f213ca41f9b13ff1873f63a5a2857a590b87b3" dependencies = [ "ahash 0.8.3", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "chrono", @@ -263,16 +238,6 @@ dependencies = [ "num", ] -[[package]] -name = "arrow-buffer" -version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d290050c6e12a81a24ad08525cef2203c4156a6350f75508d49885d677e88ea9" -dependencies = [ - "half 2.2.1", - "num", -] - [[package]] name = "arrow-buffer" version = "38.0.0" @@ -290,7 +255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6d6e18281636c8fc0b93be59834da6bf9a72bb70fd0c98ddfdaf124da466c28" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", @@ -307,7 +272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3197dab0963a236ff8e7c82e2272535745955ac1321eb740c29f2f88b353f54e" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-cast", "arrow-data", "arrow-schema", @@ -325,7 +290,7 @@ version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb68113d6ecdbe8bba48b2c4042c151bf9e1c61244e45072a50250a6fc59bafe" dependencies = [ - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-schema", "half 2.2.1", "num", @@ -338,11 +303,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab4bbf2dd3078facb5ce0a9641316a64f42bfd8cf357e6775c8a5e6708e3a8d" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-cast", "arrow-data", "arrow-schema", - "flatbuffers 23.1.21", + "flatbuffers", ] [[package]] @@ -352,7 +317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c5b650d23746a494665d914a7fa3d21d939153cff9d53bdebe39bffa88f263" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-cast", "arrow-data", "arrow-schema", @@ -372,7 +337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68c6fce28e5011e30acc7466b5efcb8ed0197c396240bd2b10e167f275a3c208" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", @@ -388,7 +353,7 @@ checksum = "f20a421f19799d8b93eb8edde5217e910fa1e2d6ceb3c529f000e57b6db144c0" dependencies = [ "ahash 0.8.3", "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "half 2.2.1", @@ -408,7 +373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ab6613ce65b61d85a3410241744e84e48fbab0fe06e1251b4429d21b3470fd" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "num", @@ -421,7 +386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3008641239e884aefba66d8b8532da6af40d14296349fcc85935de4ba67b89e" dependencies = [ "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", @@ -433,7 +398,7 @@ dependencies = [ name = "arrow_ext" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "serde", "snafu 0.6.10", "zstd 0.12.3+zstd.1.5.2", @@ -445,7 +410,7 @@ version = "0.1.0" source = "git+https://github.com/CeresDB/influxql?rev=efbc589#efbc589fb4e884e4ce057f066e63183f02a99c51" dependencies = [ "ahash 0.8.3", - "arrow 38.0.0", + "arrow", "chrono", "comfy-table", "hashbrown 0.13.2", @@ -640,7 +605,7 @@ version = "1.2.2" dependencies = [ "analytic_engine", "arena", - "arrow 38.0.0", + "arrow", "base64 0.13.1", "clap 3.2.23", "common_types", @@ -1087,11 +1052,11 @@ dependencies = [ [[package]] name = "ceresdb-client" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2c1699cb154e97cfccd3d6a0679f561c6214a33d86b3eacb78685c7479d022" +checksum = "f5f27e14a7a0c030015c0fdb06c59c46cd6f9765e381bd920e02ff316b3be48b" dependencies = [ - "arrow 23.0.0", + "arrow", "async-trait", "ceresdbproto", "dashmap 5.4.0", @@ -1323,7 +1288,7 @@ name = "common_types" version = "1.2.2" dependencies = [ "ahash 0.8.3", - "arrow 38.0.0", + "arrow", "arrow_ext", "byteorder", "bytes_ext", @@ -1344,7 +1309,7 @@ dependencies = [ name = "common_util" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "backtrace", "ceresdbproto", "chrono", @@ -1797,7 +1762,7 @@ version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ "ahash 0.8.3", - "arrow 38.0.0", + "arrow", "arrow-array", "arrow-schema", "async-compression", @@ -1845,7 +1810,7 @@ name = "datafusion-common" version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow-array", "chrono", "num_cpus", @@ -1877,7 +1842,7 @@ version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ "ahash 0.8.3", - "arrow 38.0.0", + "arrow", "datafusion-common", "sqlparser", ] @@ -1887,7 +1852,7 @@ name = "datafusion-optimizer" version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ - "arrow 38.0.0", + "arrow", "async-trait", "chrono", "datafusion-common", @@ -1905,9 +1870,9 @@ version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ "ahash 0.8.3", - "arrow 38.0.0", + "arrow", "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-schema", "blake2", "blake3", @@ -1936,7 +1901,7 @@ name = "datafusion-proto" version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ - "arrow 38.0.0", + "arrow", "chrono", "datafusion", "datafusion-common", @@ -1950,7 +1915,7 @@ name = "datafusion-row" version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ - "arrow 38.0.0", + "arrow", "datafusion-common", "paste 1.0.12", "rand 0.8.5", @@ -1961,7 +1926,7 @@ name = "datafusion-sql" version = "23.0.0" source = "git+https://github.com/jiacai2050/arrow-datafusion.git?rev=13314c37020b90246db9b80f8294370c06e61018#13314c37020b90246db9b80f8294370c06e61018" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow-schema", "datafusion-common", "datafusion-expr", @@ -2027,7 +1992,7 @@ dependencies = [ name = "df_operator" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "base64 0.13.1", "bincode", "chrono", @@ -2239,17 +2204,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flatbuffers" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a" -dependencies = [ - "bitflags", - "smallvec", - "thiserror", -] - [[package]] name = "flatbuffers" version = "23.1.21" @@ -2929,7 +2883,7 @@ name = "interpreters" version = "1.2.2" dependencies = [ "analytic_engine", - "arrow 38.0.0", + "arrow", "async-trait", "catalog", "catalog_impls", @@ -2964,7 +2918,7 @@ name = "iox_query" version = "0.1.0" source = "git+https://github.com/CeresDB/influxql?rev=efbc589#efbc589fb4e884e4ce057f066e63183f02a99c51" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow_util", "async-trait", "chrono", @@ -2988,7 +2942,7 @@ name = "iox_query_influxql" version = "0.1.0" source = "git+https://github.com/CeresDB/influxql?rev=efbc589#efbc589fb4e884e4ce057f066e63183f02a99c51" dependencies = [ - "arrow 38.0.0", + "arrow", "chrono", "chrono-tz", "datafusion", @@ -3579,26 +3533,6 @@ dependencies = [ "twoway", ] -[[package]] -name = "multiversion" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" -dependencies = [ - "multiversion-macros", -] - -[[package]] -name = "multiversion-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "murmur2" version = "0.1.0" @@ -4166,7 +4100,7 @@ checksum = "4cbd51311f8d9ff3d2697b1522b18a588782e097d313a1a278b0faf2ccf2d3f6" dependencies = [ "ahash 0.8.3", "arrow-array", - "arrow-buffer 38.0.0", + "arrow-buffer", "arrow-cast", "arrow-data", "arrow-ipc", @@ -4196,7 +4130,7 @@ dependencies = [ name = "parquet_ext" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow_ext", "async-trait", "bytes", @@ -4772,7 +4706,7 @@ checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" name = "proxy" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow_ext", "async-trait", "bytes", @@ -4866,7 +4800,7 @@ dependencies = [ name = "query_engine" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "async-trait", "chrono", "common_types", @@ -4887,7 +4821,7 @@ dependencies = [ name = "query_frontend" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "async-trait", "catalog", "ceresdbproto", @@ -4919,7 +4853,7 @@ name = "query_functions" version = "0.1.0" source = "git+https://github.com/CeresDB/influxql?rev=efbc589#efbc589fb4e884e4ce057f066e63183f02a99c51" dependencies = [ - "arrow 38.0.0", + "arrow", "chrono", "datafusion", "itertools", @@ -5526,7 +5460,7 @@ name = "schema" version = "0.1.0" source = "git+https://github.com/CeresDB/influxql?rev=efbc589#efbc589fb4e884e4ce057f066e63183f02a99c51" dependencies = [ - "arrow 38.0.0", + "arrow", "hashbrown 0.13.2", "indexmap", "itertools", @@ -5674,7 +5608,7 @@ name = "server" version = "1.2.2" dependencies = [ "analytic_engine", - "arrow 38.0.0", + "arrow", "arrow_ext", "async-trait", "bytes", @@ -6215,7 +6149,7 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" name = "system_catalog" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "async-trait", "catalog", "ceresdbproto", @@ -6234,7 +6168,7 @@ dependencies = [ name = "table_engine" version = "1.2.2" dependencies = [ - "arrow 38.0.0", + "arrow", "arrow_ext", "async-trait", "ceresdbproto", @@ -6894,8 +6828,8 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", + "cfg-if 0.1.10", + "rand 0.3.23", "static_assertions 1.1.0", ] diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 3f36906f0f..0000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2023-02-02 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..1680342afe --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "nightly-2023-02-02" +components = [ "rustfmt", "clippy" ]