diff --git a/Cargo.lock b/Cargo.lock index cf5e0079c4..755a359720 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,9 +96,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "11.1.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4a0aa844fa9e1933504b4cd10e776167f370b746d0a622f32696d8d3b252e7" +checksum = "e94e2d315bc11f3d43f38344141453282591788381061fabc06c95e37d0dbc7d" dependencies = [ "bitflags", "chrono", @@ -121,19 +121,19 @@ dependencies = [ [[package]] name = "arrow-flight" -version = "11.1.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6538896d203d3f159be25a66279960a3cccfc24381447d06ac9240d5f60dd51a" +checksum = "713a340ae319d717e2fe0f63b9ff435a5db515026227b33293e043343d045c19" dependencies = [ "arrow", "base64 0.13.0", "bytes", "futures", "proc-macro2", - "prost 0.9.0", - "prost-derive 0.9.0", + "prost 0.10.0", + "prost-derive 0.10.0", "tokio", - "tonic 0.6.2", + "tonic", "tonic-build", ] @@ -729,10 +729,10 @@ name = "client_util" version = "0.1.0" dependencies = [ "http", - "prost 0.9.0", + "prost 0.10.0", "thiserror", "tokio", - "tonic 0.6.2", + "tonic", "tower", "workspace-hack", ] @@ -772,6 +772,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "colored" version = "2.0.0" @@ -836,7 +845,7 @@ checksum = "24cb05777feccbb2642d4f2df44d0505601a2cd88ca517d8c913f263a5a8dc8b" dependencies = [ "prost 0.10.0", "prost-types 0.10.0", - "tonic 0.7.1", + "tonic", "tracing-core", ] @@ -859,7 +868,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.7.1", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -1192,7 +1201,7 @@ dependencies = [ [[package]] name = "datafusion" version = "7.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=4c31f789564088fea0b96959d75805a0973ba14a#4c31f789564088fea0b96959d75805a0973ba14a" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=7548e961b58f75fc26fd4fb16c99377f6f468fc9#7548e961b58f75fc26fd4fb16c99377f6f468fc9" dependencies = [ "ahash", "arrow", @@ -1224,7 +1233,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "7.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=4c31f789564088fea0b96959d75805a0973ba14a#4c31f789564088fea0b96959d75805a0973ba14a" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=7548e961b58f75fc26fd4fb16c99377f6f468fc9#7548e961b58f75fc26fd4fb16c99377f6f468fc9" dependencies = [ "arrow", "ordered-float 2.10.0", @@ -1235,7 +1244,7 @@ dependencies = [ [[package]] name = "datafusion-data-access" version = "1.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=4c31f789564088fea0b96959d75805a0973ba14a#4c31f789564088fea0b96959d75805a0973ba14a" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=7548e961b58f75fc26fd4fb16c99377f6f468fc9#7548e961b58f75fc26fd4fb16c99377f6f468fc9" dependencies = [ "async-trait", "chrono", @@ -1248,7 +1257,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "7.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=4c31f789564088fea0b96959d75805a0973ba14a#4c31f789564088fea0b96959d75805a0973ba14a" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=7548e961b58f75fc26fd4fb16c99377f6f468fc9#7548e961b58f75fc26fd4fb16c99377f6f468fc9" dependencies = [ "ahash", "arrow", @@ -1259,7 +1268,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "7.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=4c31f789564088fea0b96959d75805a0973ba14a#4c31f789564088fea0b96959d75805a0973ba14a" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=7548e961b58f75fc26fd4fb16c99377f6f468fc9#7548e961b58f75fc26fd4fb16c99377f6f468fc9" dependencies = [ "ahash", "arrow", @@ -1772,16 +1781,16 @@ dependencies = [ "datafusion 0.1.0", "num_cpus", "observability_deps", - "pbjson 0.3.0", - "pbjson-build 0.3.0", + "pbjson", + "pbjson-build", "pbjson-types", "predicate", - "prost 0.9.0", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.1", "regex", "serde", "time 0.1.0", - "tonic 0.6.2", + "tonic", "tonic-build", "workspace-hack", ] @@ -1840,14 +1849,14 @@ dependencies = [ "grpc-router-test-gen", "observability_deps", "paste", - "prost 0.9.0", - "prost-build", - "prost-types 0.9.0", + "prost 0.10.0", + "prost-build 0.10.1", + "prost-types 0.10.0", "thiserror", "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-build", "tonic-reflection", ] @@ -1856,10 +1865,10 @@ dependencies = [ name = "grpc-router-test-gen" version = "0.1.0" dependencies = [ - "prost 0.9.0", - "prost-build", - "prost-types 0.9.0", - "tonic 0.6.2", + "prost 0.10.0", + "prost-build 0.10.1", + "prost-types 0.10.0", + "tonic", "tonic-build", ] @@ -1945,14 +1954,14 @@ dependencies = [ [[package]] name = "heappy" version = "0.1.0" -source = "git+https://github.com/mkmik/heappy?rev=1770cd0cde556d121e7f017538ddda0e1778126a#1770cd0cde556d121e7f017538ddda0e1778126a" +source = "git+https://github.com/mkmik/heappy?rev=963fe6c0396794d4658b691421497f32c9eba6c7#963fe6c0396794d4658b691421497f32c9eba6c7" dependencies = [ "backtrace", "bytes", "lazy_static", "libc", - "pprof 0.6.2", - "spin 0.9.2", + "pprof", + "spin 0.9.3", "thiserror", "tikv-jemalloc-sys", ] @@ -2160,24 +2169,6 @@ dependencies = [ "hashbrown 0.11.2", ] -[[package]] -name = "inferno" -version = "0.10.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3886428c6400486522cf44b8626e7b94ad794c14390290f2a274dcf728a58f" -dependencies = [ - "ahash", - "atty", - "indexmap", - "itoa 1.0.1", - "lazy_static", - "log", - "num-format", - "quick-xml", - "rgb", - "str_stack", -] - [[package]] name = "inferno" version = "0.11.1" @@ -2291,7 +2282,7 @@ dependencies = [ "pin-project", "predicate", "predicates", - "prost 0.9.0", + "prost 0.10.0", "querier", "query", "rand", @@ -2318,7 +2309,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "tower", @@ -2347,13 +2338,13 @@ dependencies = [ "mutable_batch", "mutable_batch_lp", "mutable_batch_pb", - "prost 0.9.0", + "prost 0.10.0", "rand", "serde", "serde_json", "thiserror", "tokio", - "tonic 0.6.2", + "tonic", "uuid", ] @@ -2376,8 +2367,8 @@ dependencies = [ "client_util", "futures-util", "generated_types", - "prost 0.9.0", - "tonic 0.6.2", + "prost 0.10.0", + "tonic", "workspace-hack", ] @@ -2440,7 +2431,7 @@ dependencies = [ "paste", "pin-project", "predicate", - "prost 0.9.0", + "prost 0.10.0", "query", "schema", "snafu", @@ -2450,7 +2441,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "trace", "tracker", "uuid", @@ -2538,7 +2529,7 @@ dependencies = [ "serde_urlencoded", "time 0.1.0", "tokio", - "tonic 0.6.2", + "tonic", "trace", "uuid", "workspace-hack", @@ -2588,14 +2579,14 @@ dependencies = [ "kube-derive", "kube-runtime", "parking_lot 0.11.2", - "pbjson-build 0.3.0", - "prost 0.9.0", + "pbjson-build", + "prost 0.10.0", "schemars", "serde", "serde_json", "thiserror", "tokio", - "tonic 0.6.2", + "tonic", "tonic-build", "tracing", "trogging", @@ -2639,7 +2630,7 @@ dependencies = [ "time 0.1.0", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "trace", "uuid", "workspace-hack", @@ -2688,9 +2679,9 @@ dependencies = [ "mutable_batch_lp", "observability_deps", "parking_lot 0.12.0", - "pprof 0.7.0", + "pprof", "predicate", - "prost 0.9.0", + "prost 0.10.0", "reqwest", "serde", "serde_json", @@ -2699,7 +2690,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tower", "trace", @@ -2729,7 +2720,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2763,7 +2754,7 @@ dependencies = [ "mutable_batch_pb", "object_store", "observability_deps", - "prost 0.9.0", + "prost 0.10.0", "query", "reqwest", "schema", @@ -2780,7 +2771,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2812,7 +2803,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2845,7 +2836,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2875,7 +2866,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2907,7 +2898,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -2932,7 +2923,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "tonic-health", "tonic-reflection", "trace", @@ -3569,7 +3560,7 @@ dependencies = [ "mutable_batch", "mutable_batch_lp", "mutable_batch_pb", - "prost 0.9.0", + "prost 0.10.0", ] [[package]] @@ -3972,9 +3963,9 @@ dependencies = [ [[package]] name = "parquet" -version = "11.1.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2ba225e8c800adda2da6b0d63a65abf71867868682947ccb8fc6a9c68ba541" +checksum = "13c5df78854c7d56aed3aba69fb1b342dda41c384963f4ddfa962b690572b42a" dependencies = [ "arrow", "base64 0.13.0", @@ -4024,7 +4015,7 @@ dependencies = [ "pbjson-types", "persistence_windows", "predicate", - "prost 0.9.0", + "prost 0.10.0", "schema", "snafu", "tempfile", @@ -4061,7 +4052,7 @@ dependencies = [ "pbjson-types", "persistence_windows", "predicate", - "prost 0.9.0", + "prost 0.10.0", "schema", "snafu", "tempfile", @@ -4081,16 +4072,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" -[[package]] -name = "pbjson" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079e9b3d4073caf333009fe23e464c7d76f512112bb1ae034f6592958fadc0b8" -dependencies = [ - "base64 0.13.0", - "serde", -] - [[package]] name = "pbjson" version = "0.3.0" @@ -4101,18 +4082,6 @@ dependencies = [ "serde", ] -[[package]] -name = "pbjson-build" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ded6959888ee91bc803eb467411e416181ce68c125955338c2ad7dfbfa610d" -dependencies = [ - "heck 0.4.0", - "itertools", - "prost 0.9.0", - "prost-types 0.9.0", -] - [[package]] name = "pbjson-build" version = "0.3.0" @@ -4127,16 +4096,16 @@ dependencies = [ [[package]] name = "pbjson-types" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d94ffa4c36eb9d09fb8e0461f8256347d1e48793f53a8a210b43726f4ec884" +checksum = "2c20bd6ec3b4ba0073e7e5a1a770abd95723b431bf0e1941d2dd8aace9ffb97f" dependencies = [ "bytes", "chrono", - "pbjson 0.2.3", - "pbjson-build 0.2.3", - "prost 0.9.0", - "prost-build", + "pbjson", + "pbjson-build", + "prost 0.10.0", + "prost-build 0.10.1", "serde", ] @@ -4304,30 +4273,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "pprof" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f35f865aa964be21fcde114cbd1cfbd9bf8a471460ed965b0f84f96c711401" -dependencies = [ - "backtrace", - "cfg-if", - "findshlibs", - "inferno 0.10.12", - "lazy_static", - "libc", - "log", - "nix", - "parking_lot 0.11.2", - "prost 0.9.0", - "prost-build", - "prost-derive 0.9.0", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", -] - [[package]] name = "pprof" version = "0.7.0" @@ -4337,15 +4282,16 @@ dependencies = [ "backtrace", "cfg-if", "findshlibs", - "inferno 0.11.1", + "inferno", "libc", "log", "nix", "once_cell", "parking_lot 0.12.0", "prost 0.9.0", - "prost-build", + "prost-build 0.9.0", "prost-derive 0.9.0", + "protobuf", "smallvec", "symbolic-demangle", "tempfile", @@ -4423,6 +4369,16 @@ dependencies = [ "output_vt100", ] +[[package]] +name = "prettyplease" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4530,6 +4486,28 @@ dependencies = [ "which", ] +[[package]] +name = "prost-build" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120fbe7988713f39d780a58cf1a7ef0d7ef66c6d87e5aa3438940c05357929f4" +dependencies = [ + "bytes", + "cfg-if", + "cmake", + "heck 0.4.0", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost 0.10.0", + "prost-types 0.10.0", + "regex", + "tempfile", + "which", +] + [[package]] name = "prost-derive" version = "0.9.0" @@ -4576,6 +4554,12 @@ dependencies = [ "prost 0.10.0", ] +[[package]] +name = "protobuf" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" + [[package]] name = "querier" version = "0.1.0" @@ -4607,7 +4591,7 @@ dependencies = [ "pin-project", "predicate", "proptest", - "prost 0.9.0", + "prost 0.10.0", "query", "rand", "schema", @@ -4617,7 +4601,7 @@ dependencies = [ "time 0.1.0", "tokio", "tokio-util 0.7.1", - "tonic 0.6.2", + "tonic", "trace", "uuid", "workspace-hack", @@ -5015,7 +4999,7 @@ dependencies = [ "thiserror", "time 0.1.0", "tokio", - "tonic 0.6.2", + "tonic", "trace", "workspace-hack", "write_buffer", @@ -5600,14 +5584,14 @@ dependencies = [ "generated_types", "observability_deps", "pin-project", - "prost 0.9.0", + "prost 0.10.0", "query", "serde", "serde_json", "service_common", "snafu", "tokio", - "tonic 0.6.2", + "tonic", "workspace-hack", ] @@ -5627,7 +5611,7 @@ dependencies = [ "panic_logging", "parking_lot 0.12.0", "predicate", - "prost 0.9.0", + "prost 0.10.0", "query", "regex", "schema", @@ -5640,7 +5624,7 @@ dependencies = [ "test_helpers", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "trace_http", "workspace-hack", ] @@ -5651,7 +5635,7 @@ version = "0.1.0" dependencies = [ "generated_types", "observability_deps", - "tonic 0.6.2", + "tonic", "workspace-hack", ] @@ -5807,9 +5791,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" dependencies = [ "lock_api", ] @@ -6374,37 +6358,6 @@ dependencies = [ "serde", ] -[[package]] -name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.0", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", - "tokio", - "tokio-stream", - "tokio-util 0.6.9", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - [[package]] name = "tonic" version = "0.7.1" @@ -6439,43 +6392,44 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +checksum = "4d17087af5c80e5d5fc8ba9878e60258065a0a757e35efe7a05b7904bece1943" dependencies = [ + "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.10.1", "quote", "syn", ] [[package]] name = "tonic-health" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae388bee1d4e52c9dc334f0d5918757b07b3ffafafd7953d254c7a0e8605e02" +checksum = "9da1806c3ff2f02fb6d9b62fc72a2f3b6429c7f2f5d87861f548156708afcd71" dependencies = [ "async-stream", "bytes", - "prost 0.9.0", + "prost 0.10.0", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "tonic-build", ] [[package]] name = "tonic-reflection" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228cc5aa5d3e6e0624b5f756a7558038ee86428d1d58d8c6e551b389b12cf355" +checksum = "d1d786fcf313b48f1aac280142eae249f3c03495355c7906aa49872a41955015" dependencies = [ "bytes", - "prost 0.9.0", - "prost-types 0.9.0", + "prost 0.10.0", + "prost-types 0.10.0", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "tonic-build", ] @@ -7151,8 +7105,6 @@ dependencies = [ "parquet", "predicates", "proptest", - "prost 0.9.0", - "prost-types 0.9.0", "rand", "regex", "regex-automata", @@ -7205,7 +7157,7 @@ dependencies = [ "observability_deps", "parking_lot 0.12.0", "pin-project", - "prost 0.9.0", + "prost 0.10.0", "rskafka", "schema", "tempfile", diff --git a/arrow_util/Cargo.toml b/arrow_util/Cargo.toml index 8c2a88e85b..1e9b64c9d5 100644 --- a/arrow_util/Cargo.toml +++ b/arrow_util/Cargo.toml @@ -7,7 +7,7 @@ description = "Apache Arrow utilities" [dependencies] ahash = { version = "0.7.5", default-features = false } -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } # used by arrow anyway (needed for printing workaround) chrono = { version = "0.4", default-features = false } comfy-table = { version = "5.0", default-features = false } diff --git a/client_util/Cargo.toml b/client_util/Cargo.toml index 0cb7220dbe..9935311951 100644 --- a/client_util/Cargo.toml +++ b/client_util/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] http = "0.2.3" -prost = "0.9" +prost = "0.10" thiserror = "1.0.30" -tonic = { version = "0.6" } +tonic = { version = "0.7" } tower = "0.4" workspace-hack = { path = "../workspace-hack"} diff --git a/compactor/Cargo.toml b/compactor/Cargo.toml index 10efcad7bf..a948b2b3f0 100644 --- a/compactor/Cargo.toml +++ b/compactor/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Luke Bond "] edition = "2021" [dependencies] -arrow = { version = "11.1.0", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } async-trait = "0.1.53" backoff = { path = "../backoff" } bytes = "1.0" diff --git a/datafusion/Cargo.toml b/datafusion/Cargo.toml index fb7da8b7cb..eec353595f 100644 --- a/datafusion/Cargo.toml +++ b/datafusion/Cargo.toml @@ -9,5 +9,5 @@ description = "Re-exports datafusion at a specific version" # Rename to workaround doctest bug # Turn off optional datafusion features (e.g. don't get support for crypo functions or avro) -upstream = { git = "https://github.com/apache/arrow-datafusion.git", rev="4c31f789564088fea0b96959d75805a0973ba14a", default-features = false, package = "datafusion" } +upstream = { git = "https://github.com/apache/arrow-datafusion.git", rev="7548e961b58f75fc26fd4fb16c99377f6f468fc9", default-features = false, package = "datafusion" } workspace-hack = { path = "../workspace-hack"} diff --git a/db/Cargo.toml b/db/Cargo.toml index 3c25c4d215..08d29474be 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -5,7 +5,7 @@ authors = ["pauldix "] edition = "2021" [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } async-trait = "0.1" data_types = { path = "../data_types" } datafusion = { path = "../datafusion" } diff --git a/db/src/lib.rs b/db/src/lib.rs index 742dc32e50..eab9b47181 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -1678,7 +1678,7 @@ mod tests { assert_storage_gauge(registry, "catalog_loaded_rows", "read_buffer", 0); assert_storage_gauge(registry, "catalog_loaded_rows", "object_store", 0); - catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 1303); + catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 1311); db.compact_partition("cpu", "1970-01-01T00").await.unwrap(); @@ -2030,7 +2030,7 @@ mod tests { let registry = test_db.metric_registry.as_ref(); // MUB chunk size - catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 3647); + catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 3655); // With the above data, cardinality of tag2 is 2 and tag1 is 5. Hence, RUB is sorted on (tag2, tag1) let rb_chunk = db @@ -2140,7 +2140,7 @@ mod tests { // Read buffer + Parquet chunk size catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 0); catalog_chunk_size_bytes_metric_eq(registry, "read_buffer", 1700); - catalog_chunk_size_bytes_metric_eq(registry, "object_store", 1236); + catalog_chunk_size_bytes_metric_eq(registry, "object_store", 1235); // All the chunks should have different IDs assert_ne!(mb_chunk.id(), rb_chunk.id()); @@ -2257,7 +2257,7 @@ mod tests { let registry = test_db.metric_registry.as_ref(); // Read buffer + Parquet chunk size - let object_store_bytes = 1236; + let object_store_bytes = 1235; catalog_chunk_size_bytes_metric_eq(registry, "mutable_buffer", 0); catalog_chunk_size_bytes_metric_eq(registry, "read_buffer", 1700); catalog_chunk_size_bytes_metric_eq(registry, "object_store", object_store_bytes); @@ -2750,7 +2750,7 @@ mod tests { id: chunk_summaries[1].id, storage: ChunkStorage::ClosedMutableBuffer, lifecycle_action, - memory_bytes: 2526, + memory_bytes: 2534, object_store_bytes: 0, // no OS chunks row_count: 1, time_of_last_access: None, @@ -2785,7 +2785,7 @@ mod tests { ); } - assert_eq!(db.catalog.metrics().memory().mutable_buffer(), 2526 + 1495); + assert_eq!(db.catalog.metrics().memory().mutable_buffer(), 2534 + 1495); assert_eq!(db.catalog.metrics().memory().read_buffer(), 2550); assert_eq!(db.catalog.metrics().memory().object_store(), 1546); } diff --git a/generated_types/Cargo.toml b/generated_types/Cargo.toml index a64a39369a..5ab524c152 100644 --- a/generated_types/Cargo.toml +++ b/generated_types/Cargo.toml @@ -11,12 +11,12 @@ data_types2 = { path = "../data_types2", optional = true } datafusion = { path = "../datafusion", optional = true } observability_deps = { path = "../observability_deps" } pbjson = "0.3" -pbjson-types = "0.2" +pbjson-types = "0.3" predicate = { path = "../predicate", optional = true } -prost = "0.9" +prost = "0.10" regex = "1" serde = { version = "1.0", features = ["derive"] } -tonic = "0.6" +tonic = "0.7" time = { path = "../time" } workspace-hack = { path = "../workspace-hack"} @@ -25,8 +25,8 @@ data_types = { path = "../data_types" } num_cpus = "1.13.0" [build-dependencies] # In alphabetical order -tonic-build = "0.6" -prost-build = "0.9" +tonic-build = "0.7" +prost-build = "0.10" pbjson-build = "0.3" [features] diff --git a/generated_types/build.rs b/generated_types/build.rs index 951d213c9f..42c2aac258 100644 --- a/generated_types/build.rs +++ b/generated_types/build.rs @@ -130,7 +130,8 @@ fn generate_grpc_types(root: &Path) -> Result<()> { let descriptor_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("proto_descriptor.bin"); tonic_build::configure() .file_descriptor_set_path(&descriptor_path) - .format(true) + // protoc in unbuntu builder needs this option + .protoc_arg("--experimental_allow_proto3_optional") .compile_with_config(config, &proto_files, &[root])?; let descriptor_set = std::fs::read(descriptor_path)?; diff --git a/grpc-router-test-gen/Cargo.toml b/grpc-router-test-gen/Cargo.toml index 253c426af4..a34f94f538 100644 --- a/grpc-router-test-gen/Cargo.toml +++ b/grpc-router-test-gen/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" description = "Protobuf used in test for the grpc-router crate; need to be in a separate create because of linter limitations" [dependencies] -tonic = "0.6" -prost = "0.9" -prost-types = "0.9" +tonic = "0.7" +prost = "0.10" +prost-types = "0.10" [build-dependencies] -tonic-build = "0.6" -prost-build = "0.9" +tonic-build = "0.7" +prost-build = "0.10" diff --git a/grpc-router-test-gen/build.rs b/grpc-router-test-gen/build.rs index ba9d6f4d33..c7649790fe 100644 --- a/grpc-router-test-gen/build.rs +++ b/grpc-router-test-gen/build.rs @@ -20,7 +20,5 @@ fn generate_grpc_types(root: &Path) -> Result<()> { config.disable_comments(&[".google"]); - tonic_build::configure() - .format(true) - .compile_with_config(config, &proto_files, &[root]) + tonic_build::configure().compile_with_config(config, &proto_files, &[root]) } diff --git a/grpc-router/Cargo.toml b/grpc-router/Cargo.toml index 4db20c903a..e4b37c213f 100644 --- a/grpc-router/Cargo.toml +++ b/grpc-router/Cargo.toml @@ -10,19 +10,19 @@ cache_loader_async = {version = "0.2.0", features = ["ttl-cache"] } futures = "0.3" observability_deps = { path = "../observability_deps" } paste = "1.0.7" -prost = "0.9" -prost-types = "0.9" +prost = "0.10" +prost-types = "0.10" thiserror = "1.0.30" tokio = { version = "1.17", features = ["macros", "parking_lot", "rt-multi-thread"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-reflection = "0.4.0" [build-dependencies] paste = "1.0.7" -prost-build = "0.9" -tonic-build = "0.6" +prost-build = "0.10" +tonic-build = "0.7" [dev-dependencies] grpc-router-test-gen = { path = "../grpc-router-test-gen" } diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index 8a0b973dc7..27a8f2765c 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -62,8 +62,8 @@ write_buffer = { path = "../write_buffer" } # Crates.io dependencies, in alphabetical order ansi_term = "0.12" -arrow = { version = "11", features = ["prettyprint"] } -arrow-flight = "11" +arrow = { version = "12", features = ["prettyprint"] } +arrow-flight = "12" async-trait = "0.1" backtrace = "0.3" byteorder = "1.3.4" @@ -87,9 +87,9 @@ log = "0.4" num_cpus = "1.13.0" once_cell = { version = "1.10.0", features = ["parking_lot"] } parking_lot = "0.12" -parquet = "11" +parquet = "12" pin-project = "1.0" -prost = "0.9" +prost = "0.10" regex = "1.5.4" rustyline = { version = "9.0", default-features = false } serde = { version = "1.0", features = ["derive"] } @@ -101,14 +101,14 @@ tikv-jemalloc-ctl = { version = "0.4.0", optional = true } tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" tower = "0.4" uuid = { version = "0.8", features = ["v4"] } # jemalloc-sys with unprefixed_malloc_on_supported_platforms feature and heappy are mutually exclusive tikv-jemalloc-sys = { version = "0.4.0", optional = true, features = ["unprefixed_malloc_on_supported_platforms"] } -heappy = { git = "https://github.com/mkmik/heappy", rev = "1770cd0cde556d121e7f017538ddda0e1778126a", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true } +heappy = { git = "https://github.com/mkmik/heappy", rev = "963fe6c0396794d4658b691421497f32c9eba6c7", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml index c88ecb0f4d..3d7d360fc5 100644 --- a/influxdb_iox_client/Cargo.toml +++ b/influxdb_iox_client/Cargo.toml @@ -17,20 +17,20 @@ client_util = { path = "../client_util" } generated_types = { path = "../generated_types", default-features = false } # Crates.io dependencies, in alphabetical order -arrow = { version = "11", optional = true } -arrow-flight = { version = "11", optional = true } +arrow = { version = "12", optional = true } +arrow-flight = { version = "12", optional = true } bytes = "1.0" futures-util = { version = "0.3", optional = true } dml = { path = "../dml", optional = true } mutable_batch = { path = "../mutable_batch", optional = true } mutable_batch_lp = { path = "../mutable_batch_lp", optional = true } mutable_batch_pb = { path = "../mutable_batch_pb", optional = true } -prost = "0.9" +prost = "0.10" rand = "0.8.3" serde = "1.0.128" serde_json = { version = "1.0.79", optional = true } thiserror = "1.0.30" -tonic = { version = "0.6" } +tonic = { version = "0.7" } uuid = { version = "0.8", features = ["v4"] } [dev-dependencies] # In alphabetical order diff --git a/influxdb_storage_client/Cargo.toml b/influxdb_storage_client/Cargo.toml index d31f8475c8..2d4bafbc14 100644 --- a/influxdb_storage_client/Cargo.toml +++ b/influxdb_storage_client/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [dependencies] client_util = { path = "../client_util" } generated_types = { path = "../generated_types", default-features=false } -prost = "0.9" -tonic = { version = "0.6" } +prost = "0.10" +tonic = { version = "0.7" } futures-util = { version = "0.3" } workspace-hack = { path = "../workspace-hack"} diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml index 50fb60c668..4621567f5a 100644 --- a/ingester/Cargo.toml +++ b/ingester/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Nga Tran "] edition = "2021" [dependencies] -arrow = { version = "11", features = ["prettyprint"] } -arrow-flight = "11" +arrow = { version = "12", features = ["prettyprint"] } +arrow-flight = "12" arrow_util = { path = "../arrow_util" } async-trait = "0.1.53" backoff = { path = "../backoff" } @@ -27,18 +27,18 @@ mutable_batch_lp = { path = "../mutable_batch_lp" } object_store = { path = "../object_store" } observability_deps = { path = "../observability_deps" } parking_lot = "0.12" -parquet = "11" +parquet = "12" parquet_file = { path = "../parquet_file" } pin-project = "1.0" predicate = { path = "../predicate" } -prost = "0.9" +prost = "0.10" query = { path = "../query" } schema = { path = "../schema" } snafu = "0.7" thiserror = "1.0" time = { path = "../time" } tokio = { version = "1.17", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] } -tonic = { version = "0.6" } +tonic = { version = "0.7" } tracker = { path = "../tracker" } uuid = { version = "0.8", features = ["v4"] } workspace-hack = { path = "../workspace-hack"} diff --git a/iox_catalog_service/Cargo.toml b/iox_catalog_service/Cargo.toml index 68b6266106..be69b81353 100644 --- a/iox_catalog_service/Cargo.toml +++ b/iox_catalog_service/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0" serde_urlencoded = "0.7" time = { path = "../time" } tokio = { version = "1", features = ["rt-multi-thread", "macros"] } -tonic = "0.6" +tonic = "0.7" trace = { path = "../trace/" } workspace-hack = { path = "../workspace-hack"} diff --git a/iox_gitops_adapter/Cargo.toml b/iox_gitops_adapter/Cargo.toml index 6c5589341c..dcd7e20b61 100644 --- a/iox_gitops_adapter/Cargo.toml +++ b/iox_gitops_adapter/Cargo.toml @@ -23,13 +23,13 @@ k8s-openapi = { version = "0.14", features = ["v1_19", "schemars"], default-feat kube = { version = "0.71", default-features = false, features = ["client", "rustls-tls", "derive"] } kube-derive = { version = "0.71", default-features = false } # only needed to opt out of schema kube-runtime = "0.71" -prost = "0.9" +prost = "0.10" schemars = { version = "0.8.8", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" tokio = { version = "1.17", features = ["rt-multi-thread", "macros", "parking_lot"] } -tonic = "0.6" +tonic = "0.7" tracing = { version = "0.1" } workspace-hack = { path = "../workspace-hack"} trogging = { path = "../trogging", default-features = false, features = ["clap"] } @@ -37,7 +37,7 @@ trogging = { path = "../trogging", default-features = false, features = ["clap"] [build-dependencies] glob = "0.3.0" pbjson-build = "0.3" -tonic-build = "0.6" +tonic-build = "0.7" [dev-dependencies] assert_matches = "1.5" diff --git a/iox_object_store_service/Cargo.toml b/iox_object_store_service/Cargo.toml index f8134ea13d..54fe1434ea 100644 --- a/iox_object_store_service/Cargo.toml +++ b/iox_object_store_service/Cargo.toml @@ -19,7 +19,7 @@ serde_urlencoded = "0.7" time = { path = "../time" } tokio = { version = "1", features = ["rt-multi-thread", "macros"] } tokio-stream = "0.1" -tonic = "0.6" +tonic = "0.7" trace = { path = "../trace/" } uuid = { version = "0.8", features = ["v4"] } workspace-hack = { path = "../workspace-hack"} diff --git a/iox_tests/Cargo.toml b/iox_tests/Cargo.toml index c2834be1d4..1b7d242e46 100644 --- a/iox_tests/Cargo.toml +++ b/iox_tests/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" description = "IOx NG test utils and tests" [dependencies] -arrow = "11" +arrow = "12" bytes = "1.0" data_types2 = { path = "../data_types2" } iox_catalog = { path = "../iox_catalog" } diff --git a/ioxd_common/Cargo.toml b/ioxd_common/Cargo.toml index 57a88a71c2..6d96e2a921 100644 --- a/ioxd_common/Cargo.toml +++ b/ioxd_common/Cargo.toml @@ -34,7 +34,7 @@ http = "0.2.0" hyper = "0.14" log = "0.4" parking_lot = "0.12" -prost = "0.9" +prost = "0.10" reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.79" @@ -43,8 +43,8 @@ snafu = "0.7" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-util = { version = "0.7.0" } tokio-stream = { version = "0.1", features = ["net"] } -tonic = "0.6" -tonic-health = "0.5.0" +tonic = "0.7" +tonic-health = "0.6.0" tower = "0.4" workspace-hack = { path = "../workspace-hack"} diff --git a/ioxd_common/src/http/mod.rs b/ioxd_common/src/http/mod.rs index 52fb7c93af..48c7576aee 100644 --- a/ioxd_common/src/http/mod.rs +++ b/ioxd_common/src/http/mod.rs @@ -51,7 +51,9 @@ pub enum ApplicationError { HeappyError { source: heappy::Error }, #[snafu(display("Protobuf error: {}", source))] - Prost { source: prost::EncodeError }, + Prost { + source: Box, + }, #[snafu(display("Protobuf error: {}", source))] ProstIO { source: std::io::Error }, @@ -272,7 +274,10 @@ async fn pprof_profile(req: Request) -> Result, Application .pprof() .map_err(|e| Box::new(e) as _) .context(PProfSnafu)?; - profile.encode(&mut body).context(ProstSnafu)?; + profile + .encode(&mut body) + .map_err(|e| Box::new(e) as _) + .context(ProstSnafu)?; } Ok(Response::new(Body::from(body))) diff --git a/ioxd_compactor/Cargo.toml b/ioxd_compactor/Cargo.toml index a3d8715fcb..7c637eeb15 100644 --- a/ioxd_compactor/Cargo.toml +++ b/ioxd_compactor/Cargo.toml @@ -28,7 +28,7 @@ thiserror = "1.0.30" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} diff --git a/ioxd_database/Cargo.toml b/ioxd_database/Cargo.toml index fa78ef396c..b560757d47 100644 --- a/ioxd_database/Cargo.toml +++ b/ioxd_database/Cargo.toml @@ -31,13 +31,13 @@ tracker = { path = "../tracker" } uuid = { version = "0.8", features = ["v4"] } # Crates.io dependencies, in alphabetical order -arrow-flight = "11" +arrow-flight = "12" async-trait = "0.1" bytes = "1.0" futures = "0.3" http = "0.2.0" hyper = "0.14" -prost = "0.9" +prost = "0.10" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.79" serde_urlencoded = "0.7.0" @@ -46,9 +46,9 @@ snafu = "0.7" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.0" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} [dev-dependencies] @@ -60,6 +60,6 @@ trace_exporters = { path = "../trace_exporters" } schema = { path = "../schema" } # Crates.io dependencies, in alphabetical order -arrow = "11" +arrow = "12" clap = { version = "3", features = ["derive", "env"] } reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] } diff --git a/ioxd_ingester/Cargo.toml b/ioxd_ingester/Cargo.toml index 1dd202257d..1263d28055 100644 --- a/ioxd_ingester/Cargo.toml +++ b/ioxd_ingester/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "1.0.30" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} diff --git a/ioxd_querier/Cargo.toml b/ioxd_querier/Cargo.toml index 793f548234..21f6874c86 100644 --- a/ioxd_querier/Cargo.toml +++ b/ioxd_querier/Cargo.toml @@ -24,15 +24,15 @@ trace = { path = "../trace" } trace_http = { path = "../trace_http" } # Crates.io dependencies, in alphabetical order -arrow-flight = "11" +arrow-flight = "12" async-trait = "0.1" hyper = "0.14" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} diff --git a/ioxd_router/Cargo.toml b/ioxd_router/Cargo.toml index a8f86996c3..19cf82a253 100644 --- a/ioxd_router/Cargo.toml +++ b/ioxd_router/Cargo.toml @@ -27,9 +27,9 @@ http = "0.2.0" hyper = "0.14" snafu = "0.7" -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.0" } diff --git a/ioxd_router2/Cargo.toml b/ioxd_router2/Cargo.toml index f3c63515fb..767aa7aada 100644 --- a/ioxd_router2/Cargo.toml +++ b/ioxd_router2/Cargo.toml @@ -25,7 +25,7 @@ write_buffer = { path = "../write_buffer" } write_summary = { path = "../write_summary" } # Crates.io dependencies, in alphabetical order -arrow-flight = "11" +arrow-flight = "12" async-trait = "0.1" hashbrown = "0.12" hyper = "0.14" @@ -33,7 +33,7 @@ thiserror = "1.0.30" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} diff --git a/ioxd_test/Cargo.toml b/ioxd_test/Cargo.toml index 88072af18d..d35c175bbb 100644 --- a/ioxd_test/Cargo.toml +++ b/ioxd_test/Cargo.toml @@ -23,7 +23,7 @@ snafu = "0.7" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7.1" } -tonic = "0.6" -tonic-health = "0.5.0" -tonic-reflection = "0.3.0" +tonic = "0.7" +tonic-health = "0.6.0" +tonic-reflection = "0.4.0" workspace-hack = { path = "../workspace-hack"} diff --git a/mutable_batch/Cargo.toml b/mutable_batch/Cargo.toml index daa3755806..159c648949 100644 --- a/mutable_batch/Cargo.toml +++ b/mutable_batch/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "A mutable arrow RecordBatch" [dependencies] -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } arrow_util = { path = "../arrow_util" } chrono = { version = "0.4", default-features = false } data_types = { path = "../data_types" } diff --git a/mutable_batch_tests/Cargo.toml b/mutable_batch_tests/Cargo.toml index 10f3e5c5fa..e4ce50ea1b 100644 --- a/mutable_batch_tests/Cargo.toml +++ b/mutable_batch_tests/Cargo.toml @@ -11,7 +11,7 @@ generated_types = { path = "../generated_types" } mutable_batch = { path = "../mutable_batch" } mutable_batch_lp = { path = "../mutable_batch_lp" } mutable_batch_pb = { path = "../mutable_batch_pb" } -prost = "0.9" +prost = "0.10" [dev-dependencies] bytes = "1.0" diff --git a/mutable_buffer/Cargo.toml b/mutable_buffer/Cargo.toml index 7d10330ece..c0e2a38600 100644 --- a/mutable_buffer/Cargo.toml +++ b/mutable_buffer/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Andrew Lamb "] edition = "2021" [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } data_types = { path = "../data_types" } schema = { path = "../schema" } metric = { path = "../metric" } diff --git a/packers/Cargo.toml b/packers/Cargo.toml index 00213e2c35..9d56fa299b 100644 --- a/packers/Cargo.toml +++ b/packers/Cargo.toml @@ -5,12 +5,12 @@ authors = ["Andrew Lamb "] edition = "2021" [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } influxdb_tsm = { path = "../influxdb_tsm" } schema = { path = "../schema" } snafu = "0.7" observability_deps = { path = "../observability_deps" } -parquet = "11" +parquet = "12" workspace-hack = { path = "../workspace-hack"} [dev-dependencies] # In alphabetical order diff --git a/parquet_catalog/Cargo.toml b/parquet_catalog/Cargo.toml index 83a5884404..e1ab2d11bc 100644 --- a/parquet_catalog/Cargo.toml +++ b/parquet_catalog/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } base64 = "0.13" bytes = "1.0" data_types = { path = "../data_types" } @@ -16,14 +16,14 @@ iox_object_store = { path = "../iox_object_store" } metric = { path = "../metric" } object_store = { path = "../object_store" } observability_deps = { path = "../observability_deps" } -parquet = "11" +parquet = "12" parquet_file = { path = "../parquet_file" } parquet-format = "4.0" parking_lot = "0.12" -pbjson-types = "0.2" +pbjson-types = "0.3" persistence_windows = { path = "../persistence_windows" } predicate = { path = "../predicate" } -prost = "0.9" +prost = "0.10" snafu = "0.7" schema = { path = "../schema" } tempfile = "3.1.0" diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml index f856487f68..0e4c876e2a 100644 --- a/parquet_file/Cargo.toml +++ b/parquet_file/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Nga Tran "] edition = "2021" [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } base64 = "0.13" bytes = "1.0" data_types = { path = "../data_types" } @@ -18,13 +18,13 @@ iox_object_store = { path = "../iox_object_store" } metric = { path = "../metric" } object_store = { path = "../object_store" } observability_deps = { path = "../observability_deps" } -parquet = {version = "11", features = ["experimental"]} +parquet = {version = "12", features = ["experimental"]} parquet-format = "4.0" parking_lot = "0.12" -pbjson-types = "0.2" +pbjson-types = "0.3" persistence_windows = { path = "../persistence_windows" } predicate = { path = "../predicate" } -prost = "0.9" +prost = "0.10" snafu = "0.7" schema = { path = "../schema" } tempfile = "3.1.0" diff --git a/parquet_file/src/metadata.rs b/parquet_file/src/metadata.rs index 8b44fa36ca..7bbd9bf600 100644 --- a/parquet_file/src/metadata.rs +++ b/parquet_file/src/metadata.rs @@ -790,7 +790,7 @@ impl IoxParquetMetaData { column_orders: None, num_rows: file_metadata.num_rows(), row_groups: thrift_row_groups, - key_value_metadata: file_metadata.key_value_metadata().clone(), + key_value_metadata: file_metadata.key_value_metadata().cloned(), created_by: file_metadata.created_by().clone(), encryption_algorithm: None, footer_signing_key_metadata: None, @@ -1292,7 +1292,7 @@ mod tests { let mut generator = ChunkGenerator::new().await; let (chunk, _) = generator.generate().await.unwrap(); let parquet_metadata = chunk.parquet_metadata(); - assert_eq!(parquet_metadata.size(), 4070); + assert_eq!(parquet_metadata.size(), 4069); } #[test] diff --git a/predicate/Cargo.toml b/predicate/Cargo.toml index b6464a831b..360d83a3d0 100644 --- a/predicate/Cargo.toml +++ b/predicate/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } chrono = { version = "0.4", default-features = false } data_types = { path = "../data_types" } datafusion = { path = "../datafusion" } diff --git a/querier/Cargo.toml b/querier/Cargo.toml index d66ddc708c..16151c2186 100644 --- a/querier/Cargo.toml +++ b/querier/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -arrow = "11" -arrow-flight = "11" +arrow = "12" +arrow-flight = "12" async-trait = "0.1.53" backoff = { path = "../backoff" } bytes = "1.0" @@ -26,7 +26,7 @@ parking_lot = "0.12" parquet_file = { path = "../parquet_file" } pin-project = "1.0" predicate = { path = "../predicate" } -prost = "0.9" +prost = "0.10" query = { path = "../query" } rand = "0.8.3" service_common = { path = "../service_common" } @@ -36,7 +36,7 @@ thiserror = "1.0" time = { path = "../time" } tokio = { version = "1.17", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] } tokio-util = { version = "0.7.1" } -tonic = { version = "0.6" } +tonic = { version = "0.7" } trace = { path = "../trace" } uuid = { version = "0.8", features = ["v4"] } workspace-hack = { path = "../workspace-hack"} diff --git a/query/Cargo.toml b/query/Cargo.toml index c400a152ba..c9ed02406c 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -14,7 +14,7 @@ description = "IOx Query Interface and Executor" # 2. Allow for query logic testing without bringing in all the storage systems. [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } arrow_util = { path = "../arrow_util" } async-trait = "0.1" chrono = { version = "0.4", default-features = false } diff --git a/query_tests/Cargo.toml b/query_tests/Cargo.toml index 62b57cb7cf..edc6f3c913 100644 --- a/query_tests/Cargo.toml +++ b/query_tests/Cargo.toml @@ -25,7 +25,7 @@ query = { path = "../query" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } arrow_util = { path = "../arrow_util" } metric = { path = "../metric" } object_store = { path = "../object_store" } diff --git a/read_buffer/Cargo.toml b/read_buffer/Cargo.toml index 1d2ca6ada1..6614f1a318 100644 --- a/read_buffer/Cargo.toml +++ b/read_buffer/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" # 2. Keep change/compile/link time down during development when working on just this crate [dependencies] # In alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } arrow_util = { path = "../arrow_util" } croaring = "0.5" data_types = { path = "../data_types" } diff --git a/router2/Cargo.toml b/router2/Cargo.toml index 3443d0a7e2..f70e0789ff 100644 --- a/router2/Cargo.toml +++ b/router2/Cargo.toml @@ -34,7 +34,7 @@ siphasher = "0.3" thiserror = "1.0" time = { path = "../time" } tokio = { version = "1", features = ["rt-multi-thread", "macros"] } -tonic = "0.6" +tonic = "0.7" trace = { path = "../trace/" } workspace-hack = { path = "../workspace-hack"} write_buffer = { path = "../write_buffer" } diff --git a/schema/Cargo.toml b/schema/Cargo.toml index d928f8eb62..49bf29a71d 100644 --- a/schema/Cargo.toml +++ b/schema/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" description = "IOx Schema definition" [dependencies] -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } hashbrown = "0.12" indexmap = { version = "1.8", features = ["std"] } itertools = "0.10.1" diff --git a/service_grpc_flight/Cargo.toml b/service_grpc_flight/Cargo.toml index 1f471776f6..c2e89e18c7 100644 --- a/service_grpc_flight/Cargo.toml +++ b/service_grpc_flight/Cargo.toml @@ -15,15 +15,15 @@ query = { path = "../query" } service_common = { path = "../service_common" } # Crates.io dependencies, in alphabetical order -arrow = { version = "11", features = ["prettyprint"] } -arrow-flight = "11" +arrow = { version = "12", features = ["prettyprint"] } +arrow-flight = "12" bytes = "1.0" futures = "0.3" pin-project = "1.0" -prost = "0.9" +prost = "0.10" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.79" snafu = "0.7" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } -tonic = "0.6" +tonic = "0.7" workspace-hack = { path = "../workspace-hack"} diff --git a/service_grpc_influxrpc/Cargo.toml b/service_grpc_influxrpc/Cargo.toml index 6e7efdc3a1..07e2d89dd5 100644 --- a/service_grpc_influxrpc/Cargo.toml +++ b/service_grpc_influxrpc/Cargo.toml @@ -17,17 +17,17 @@ schema = { path = "../schema" } service_common = { path = "../service_common" } # Crates.io dependencies, in alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } async-trait = "0.1" futures = "0.3" -prost = "0.9" +prost = "0.10" regex = "1.5.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.79" snafu = "0.7" tokio = { version = "1.17", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } -tonic = "0.6" +tonic = "0.7" workspace-hack = { path = "../workspace-hack"} [dev-dependencies] diff --git a/service_grpc_testing/Cargo.toml b/service_grpc_testing/Cargo.toml index 84987d1255..c39537df13 100644 --- a/service_grpc_testing/Cargo.toml +++ b/service_grpc_testing/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] generated_types = { path = "../generated_types" } observability_deps = { path = "../observability_deps" } -tonic = "0.6" +tonic = "0.7" workspace-hack = { path = "../workspace-hack"} diff --git a/test_helpers_end_to_end_ng/Cargo.toml b/test_helpers_end_to_end_ng/Cargo.toml index 4134ec427e..4e75d85018 100644 --- a/test_helpers_end_to_end_ng/Cargo.toml +++ b/test_helpers_end_to_end_ng/Cargo.toml @@ -12,7 +12,7 @@ influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight", " test_helpers = { path = "../test_helpers" } # Crates.io dependencies, in alphabetical order -arrow = { version = "11", features = ["prettyprint"] } +arrow = { version = "12", features = ["prettyprint"] } assert_cmd = "2.0.2" futures = "0.3" http = "0.2.0" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 1d03a62d98..e68d6ad14a 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -14,7 +14,7 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] ahash = { version = "0.7", features = ["std"] } -arrow = { version = "11", features = ["comfy-table", "csv", "csv_crate", "flatbuffers", "ipc", "prettyprint", "rand", "test_utils"] } +arrow = { version = "12", features = ["comfy-table", "csv", "csv_crate", "flatbuffers", "ipc", "prettyprint", "rand", "test_utils"] } base64 = { version = "0.13", features = ["alloc", "std"] } bitflags = { version = "1" } byteorder = { version = "1", features = ["std"] } @@ -44,11 +44,9 @@ num-bigint = { version = "0.4", features = ["std"] } num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm", "std"] } once_cell = { version = "1", features = ["alloc", "parking_lot", "race", "std"] } -parquet = { version = "11", features = ["arrow", "base64", "brotli", "experimental", "flate2", "lz4", "snap", "zstd"] } +parquet = { version = "12", features = ["arrow", "base64", "brotli", "experimental", "flate2", "lz4", "snap", "zstd"] } predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] } proptest = { version = "1", features = ["bit-set", "break-dead-code", "fork", "lazy_static", "quick-error", "regex-syntax", "rusty-fork", "std", "tempfile", "timeout"] } -prost = { version = "0.9", features = ["prost-derive", "std"] } -prost-types = { version = "0.9", features = ["std"] } rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } regex-automata = { version = "0.1", features = ["regex-syntax", "std"] } @@ -103,8 +101,6 @@ memchr = { version = "2", features = ["std"] } nom = { version = "7", features = ["alloc", "std"] } num-traits = { version = "0.2", features = ["i128", "libm", "std"] } once_cell = { version = "1", features = ["alloc", "parking_lot", "race", "std"] } -prost = { version = "0.9", features = ["prost-derive", "std"] } -prost-types = { version = "0.9", features = ["std"] } rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } diff --git a/write_buffer/Cargo.toml b/write_buffer/Cargo.toml index e1e78d6dd7..bdfd8e457e 100644 --- a/write_buffer/Cargo.toml +++ b/write_buffer/Cargo.toml @@ -20,7 +20,7 @@ mutable_batch_pb = { path = "../mutable_batch_pb" } observability_deps = { path = "../observability_deps" } parking_lot = "0.12" pin-project = "1.0" -prost = "0.9" +prost = "0.10" rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="39cd7d809fe0b27c0bb5e70d8dda9964d82a5540", default-features = false, features = ["compression-snappy"] } schema = { path = "../schema" } time = { path = "../time" }