Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into crepererum/issue2434

pull/24376/head
kodiakhq[bot] 2021-08-30 14:00:10 +00:00 committed by GitHub
parent 96b0026203 b19f78e179
commit 4cbbdf1fad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Cargo.lock generated
View File

@ -1127,10 +1127,11 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
[[package]]
name = "fd-lock"
version = "2.0.0"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06"
checksum = "b8806dd91a06a7a403a8e596f9bfbfb34e469efbc363fc9c9713e79e26472e36"
dependencies = [
"cfg-if",
"libc",
"winapi",
]
@ -1474,9 +1475,9 @@ checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
[[package]]
name = "handlebars"
version = "3.5.5"
version = "4.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
checksum = "fd85ecabdb47308d28d3a4113224fefcab2510ccb4e463aee0a1362eb84c756a"
dependencies = [
"log",
"pest",
@ -2355,6 +2356,19 @@ dependencies = [
"memoffset",
]
[[package]]
name = "nix"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
"memoffset",
]
[[package]]
name = "nodrop"
version = "0.1.14"
@ -3082,7 +3096,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"nix",
"nix 0.20.1",
"parking_lot",
"prost",
"prost-build",
@ -3843,9 +3857,9 @@ dependencies = [
[[package]]
name = "rustyline"
version = "8.2.0"
version = "9.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874"
checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6"
dependencies = [
"bitflags",
"cfg-if",
@ -3855,7 +3869,7 @@ dependencies = [
"libc",
"log",
"memchr",
"nix",
"nix 0.22.1",
"radix_trie",
"scopeguard",
"smallvec",
@ -4000,9 +4014,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.66"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
dependencies = [
"indexmap",
"itoa",
@ -4486,18 +4500,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.26"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.26"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
dependencies = [
"proc-macro2",
"quote",

6
Cargo.toml
View File

@ -116,13 +116,13 @@ pprof = { version = "^0.5", default-features = false, features = ["flamegraph",
prost = "0.8"
# Forked to upgrade hyper and tokio
routerify = { git = "https://github.com/influxdata/routerify", rev = "274e250" }
rustyline = "8.0"
rustyline = "9.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.44"
serde_json = "1.0.67"
serde_urlencoded = "0.7.0"
snafu = "0.6.9"
structopt = "0.3.21"
thiserror = "1.0.23"
thiserror = "1.0.28"
tikv-jemalloc-ctl = { version = "0.4.0" }
tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] }
tokio-stream = { version = "0.1.2", features = ["net"] }

2
client_util/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
http = "0.2.3"
prost = "0.8"
thiserror = "1.0.23"
thiserror = "1.0.28"
tonic = { version = "0.5.0" }
tower = "0.4"

4
generated_types/Cargo.toml
View File

@ -18,8 +18,8 @@ prost = "0.8"
prost-types = "0.8"
regex = "1.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.44"
thiserror = "1.0.23"
serde_json = "1.0.67"
thiserror = "1.0.28"
tonic = "0.5"
[dev-dependencies]

2
grpc-router/Cargo.toml
View File

@ -12,7 +12,7 @@ observability_deps = { path = "../observability_deps" }
paste = "1.0.5"
prost = "0.8"
prost-types = "0.8"
thiserror = "1.0.23"
thiserror = "1.0.28"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "parking_lot", "signal"] }
tokio-stream = { version = "0.1.2", features = ["net"] }
tokio-util = { version = "0.6.3" }

2
influxdb2_client/Cargo.toml
View File

@ -9,7 +9,7 @@ bytes = { version = "1.0", default-features = false }
futures = { version = "0.3", default-features = false }
reqwest = { version = "0.11", features = ["stream", "json"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.44"
serde_json = "1.0.67"
snafu = "0.6.6"
url = "2.1.1"

4
influxdb_iox_client/Cargo.toml
View File

@ -21,8 +21,8 @@ futures-util = { version = "0.3.1", optional = true }
prost = "0.8"
rand = "0.8.3"
serde = "1.0.128"
serde_json = { version = "1.0.44", optional = true }
thiserror = "1.0.23"
serde_json = { version = "1.0.67", optional = true }
thiserror = "1.0.28"
tonic = { version = "0.5.0" }
[dev-dependencies] # In alphabetical order

2
iox_data_generator/Cargo.toml
View File

@ -10,7 +10,7 @@ chrono = "0.4.13"
chrono-english = "0.1.4"
clap = "2.33.1"
futures = "0.3.5"
handlebars = "3.3.0"
handlebars = "4.1.2"
data_types = { path = "../data_types" }
generated_types = { path = "../generated_types" }
influxdb2_client = { path = "../influxdb2_client" }

2
trogging/Cargo.toml
View File

@ -10,7 +10,7 @@ description = "IOx logging pipeline built upon tokio-tracing"
[dependencies]
logfmt = { path = "../logfmt" }
observability_deps = { path = "../observability_deps" }
thiserror = "1.0.23"
thiserror = "1.0.28"
tracing-log = "0.1"
tracing-subscriber = "0.2"
structopt = { version = "0.3.21", optional = true }