diff --git a/Cargo.lock b/Cargo.lock index 64dadf7ec6..c678f31a82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1016,7 +1016,7 @@ dependencies = [ "test_helpers", "time 0.1.0", "tokio", - "tokio-util", + "tokio-util 0.7.0", "trace", "tracker", "uuid", @@ -1532,7 +1532,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.0", "tonic", "tonic-build", "tonic-reflection", @@ -1564,7 +1564,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -1929,7 +1929,7 @@ dependencies = [ "time 0.1.0", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.0", "tonic", "tonic-health", "tonic-reflection", @@ -2054,7 +2054,7 @@ dependencies = [ "thiserror", "time 0.1.0", "tokio", - "tokio-util", + "tokio-util 0.7.0", "tonic", "trace", "uuid", @@ -2351,7 +2351,7 @@ dependencies = [ "thiserror", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.9", "tower", "tower-http", "tracing", @@ -2408,7 +2408,7 @@ dependencies = [ "smallvec", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] @@ -3079,7 +3079,7 @@ dependencies = [ "snafu", "tempfile", "tokio", - "tokio-util", + "tokio-util 0.7.0", "walkdir", "workspace-hack", ] @@ -3813,7 +3813,7 @@ dependencies = [ "test_helpers", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.0", "trace", "workspace-hack", ] @@ -4063,7 +4063,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util", + "tokio-util 0.6.9", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -4608,7 +4608,7 @@ dependencies = [ "test_helpers", "time 0.1.0", "tokio", - "tokio-util", + "tokio-util 0.7.0", "trace", "tracker", "uuid", @@ -5275,6 +5275,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.8" @@ -5307,7 +5321,7 @@ dependencies = [ "prost-derive", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower", "tower-layer", "tower-service", @@ -5372,7 +5386,7 @@ dependencies = [ "slab", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing", @@ -5555,7 +5569,7 @@ dependencies = [ "pin-project", "time 0.1.0", "tokio", - "tokio-util", + "tokio-util 0.7.0", "workspace-hack", ] @@ -6022,7 +6036,8 @@ dependencies = [ "syn", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", + "tokio-util 0.7.0", "tower", "tracing", "tracing-core", @@ -6059,7 +6074,7 @@ dependencies = [ "test_helpers", "time 0.1.0", "tokio", - "tokio-util", + "tokio-util 0.7.0", "trace", "trace_http", "uuid", diff --git a/db/Cargo.toml b/db/Cargo.toml index 16cf09368f..e5e8bfd9d2 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -38,7 +38,7 @@ schema = { path = "../schema" } snafu = "0.7" time = { path = "../time" } tokio = { version = "1.13", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } trace = { path = "../trace" } tracker = { path = "../tracker" } uuid = { version = "0.8", features = ["v4"] } diff --git a/grpc-router/Cargo.toml b/grpc-router/Cargo.toml index 6d2ab77fea..70ede53c9d 100644 --- a/grpc-router/Cargo.toml +++ b/grpc-router/Cargo.toml @@ -15,7 +15,7 @@ prost-types = "0.9" thiserror = "1.0.30" tokio = { version = "1.13", features = ["macros", "parking_lot", "rt-multi-thread"] } tokio-stream = { version = "0.1", features = ["net"] } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } tonic = "0.6" tonic-reflection = "0.3.0" diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index 670c29b938..7fc4a3f27f 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -88,7 +88,7 @@ thiserror = "1.0.30" tikv-jemalloc-ctl = { version = "0.4.0" } tokio = { version = "1.13", features = ["macros", "net", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] } tokio-stream = { version = "0.1", features = ["net"] } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } tonic = "0.6" tonic-health = "0.5.0" tonic-reflection = "0.3.0" diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml index 6ccb6f0f4b..e6dffe41f1 100644 --- a/ingester/Cargo.toml +++ b/ingester/Cargo.toml @@ -39,7 +39,7 @@ tonic = { version = "0.6" } uuid = { version = "0.8", features = ["v4"] } workspace-hack = { path = "../workspace-hack"} write_buffer = { path = "../write_buffer" } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } trace = { path = "../trace" } [dev-dependencies] diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index 84879330f0..5643311f02 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -30,7 +30,7 @@ rusoto_s3 = { version = "0.47.0", optional = true} snafu = "0.7" tokio = { version = "1.13", features = ["fs", "io-util", "macros", "parking_lot", "rt-multi-thread", "time"] } # Filesystem integration -tokio-util = { version = "0.6.9", features = [ "codec", "io" ] } +tokio-util = { version = "0.7.0", features = [ "codec", "io" ] } reqwest = { version = "0.11", optional = true } # Filesystem integration walkdir = "2" diff --git a/query/Cargo.toml b/query/Cargo.toml index d5fa2e2849..db3f5d4468 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -32,7 +32,7 @@ schema = { path = "../schema" } snafu = "0.7" tokio = { version = "1.13", features = ["macros", "parking_lot"] } tokio-stream = "0.1" -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } trace = { path = "../trace" } predicate = { path = "../predicate" } workspace-hack = { path = "../workspace-hack"} diff --git a/server/Cargo.toml b/server/Cargo.toml index 7126e3be96..c7344f458e 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -36,7 +36,7 @@ snafu = "0.7" time = { path = "../time" } trace = { path = "../trace" } tokio = { version = "1.13", features = ["macros", "parking_lot", "rt-multi-thread", "sync", "time"] } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } tracker = { path = "../tracker" } uuid = { version = "0.8", features = ["v4"] } write_buffer = { path = "../write_buffer" } diff --git a/tracker/Cargo.toml b/tracker/Cargo.toml index 0e76f678bf..ec2f91c678 100644 --- a/tracker/Cargo.toml +++ b/tracker/Cargo.toml @@ -16,7 +16,7 @@ parking_lot = "0.12" pin-project = "1.0" time = { path = "../time" } tokio = { version = "1.13", features = ["macros", "parking_lot", "sync", "time"] } -tokio-util = { version = "0.6.9" } +tokio-util = { version = "0.7.0" } workspace-hack = { path = "../workspace-hack"} [dev-dependencies] diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 6ce780a870..2f80a7d47e 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -52,7 +52,8 @@ sha2 = { version = "0.9", features = ["std"] } smallvec = { version = "1", default-features = false, features = ["union"] } tokio = { version = "1", features = ["bytes", "fs", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "time", "tokio-macros", "winapi"] } tokio-stream = { version = "0.1", features = ["fs", "net", "time"] } -tokio-util = { version = "0.6", features = ["codec", "io", "slab", "time"] } +tokio-util-3b31131e45eafb45 = { package = "tokio-util", version = "0.6", features = ["codec", "io", "slab", "time"] } +tokio-util-ca01ad9e24f5d932 = { package = "tokio-util", version = "0.7", features = ["codec", "io"] } tower = { version = "0.4", features = ["balance", "buffer", "discover", "filter", "futures-util", "indexmap", "limit", "load", "log", "make", "rand", "ready-cache", "slab", "timeout", "tokio", "tokio-stream", "tokio-util", "tracing", "util"] } tracing = { version = "0.1", features = ["attributes", "log", "max_level_trace", "release_max_level_debug", "std", "tracing-attributes"] } tracing-core = { version = "0.1", features = ["lazy_static", "std", "valuable"] } diff --git a/write_buffer/Cargo.toml b/write_buffer/Cargo.toml index 301fd1ecda..523cb28d07 100644 --- a/write_buffer/Cargo.toml +++ b/write_buffer/Cargo.toml @@ -25,7 +25,7 @@ rskafka = { git = "https://github.com/influxdata/rskafka.git", rev="7c74d43f50c5 schema = { path = "../schema" } time = { path = "../time" } tokio = { version = "1.13", features = ["fs", "macros", "parking_lot", "rt", "sync", "time"] } -tokio-util = "0.6.9" +tokio-util = "0.7.0" trace = { path = "../trace" } trace_http = { path = "../trace_http" } uuid = { version = "0.8", features = ["v4"] } diff --git a/write_buffer/src/file.rs b/write_buffer/src/file.rs index 057eff1da3..b9edbcbb93 100644 --- a/write_buffer/src/file.rs +++ b/write_buffer/src/file.rs @@ -366,7 +366,7 @@ impl WriteBufferReading for FileBufferConsumer { #[pin_project] struct ConsumerStream { - fut: ReusableBoxFuture>>, + fut: ReusableBoxFuture<'static, Option>>, sequencer_id: u32, path: PathBuf, next_sequence_number: Arc,