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

Merge branch 'main' into dom/test-helpers

pull/24376/head
Dom 2023-02-22 10:28:59 +00:00 committed by GitHub
parent 4c4137a1b8 1c6020d5f6
commit ae1db613eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
Cargo.lock generated
View File

@ -224,9 +224,9 @@ dependencies = [
"bytes",
"futures",
"proc-macro2",
"prost 0.11.6",
"prost-build 0.11.6",
"prost-derive 0.11.6",
"prost",
"prost-build",
"prost-derive",
"tokio",
"tonic",
"tonic-build",
@ -898,15 +898,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "cmake"
version = "0.1.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
dependencies = [
"cc",
]
[[package]]
name = "codespan-reporting"
version = "0.11.1"
@ -1070,8 +1061,8 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86"
dependencies = [
"prost 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-types",
"tonic",
"tracing-core",
]
@ -1089,7 +1080,7 @@ dependencies = [
"hdrhistogram",
"humantime",
"parking_lot 0.11.2",
"prost-types 0.11.6",
"prost-types",
"serde",
"serde_json",
"thread_local",
@ -1137,9 +1128,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "cpp_demangle"
version = "0.3.5"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442"
dependencies = [
"cfg-if",
]
@ -1548,8 +1539,8 @@ dependencies = [
"object_store",
"parking_lot 0.12.1",
"pbjson-build",
"prost 0.11.6",
"prost-build 0.11.6",
"prost",
"prost-build",
]
[[package]]
@ -1841,7 +1832,7 @@ dependencies = [
"futures",
"iox_query",
"observability_deps",
"prost 0.11.6",
"prost",
"snafu",
"tokio",
"tonic",
@ -2024,8 +2015,8 @@ dependencies = [
"pbjson-build",
"pbjson-types",
"predicate",
"prost 0.11.6",
"prost-build 0.11.6",
"prost",
"prost-build",
"query_functions",
"serde",
"snafu",
@ -2082,9 +2073,9 @@ dependencies = [
"http-body",
"hyper",
"pin-project",
"prost 0.11.6",
"prost-build 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-build",
"prost-types",
"tokio",
"tokio-stream",
"tonic",
@ -2097,9 +2088,9 @@ dependencies = [
name = "grpc-binary-logger-proto"
version = "0.1.0"
dependencies = [
"prost 0.11.6",
"prost-build 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-build",
"prost-types",
"tonic",
"tonic-build",
"workspace-hack",
@ -2109,9 +2100,9 @@ dependencies = [
name = "grpc-binary-logger-test-proto"
version = "0.1.0"
dependencies = [
"prost 0.11.6",
"prost-build 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-build",
"prost-types",
"tonic",
"tonic-build",
"workspace-hack",
@ -2209,13 +2200,13 @@ dependencies = [
[[package]]
name = "heappy"
version = "0.1.0"
source = "git+https://github.com/mkmik/heappy?rev=b98e7f7dc080d5d7972a134de0e01e999e68e350#b98e7f7dc080d5d7972a134de0e01e999e68e350"
source = "git+https://github.com/mkmik/heappy?rev=1d6ac77a4026fffce8680a7b31a9f6e9859b5e73#1d6ac77a4026fffce8680a7b31a9f6e9859b5e73"
dependencies = [
"backtrace",
"bytes",
"lazy_static",
"libc",
"pprof 0.10.1",
"pprof",
"spin 0.9.5",
"thiserror",
"tikv-jemalloc-sys",
@ -2556,7 +2547,7 @@ dependencies = [
"parquet_to_line_protocol",
"predicate",
"predicates",
"prost 0.11.6",
"prost",
"rustyline",
"schema",
"serde",
@ -2591,7 +2582,7 @@ dependencies = [
"futures-util",
"generated_types",
"influxdb_line_protocol",
"prost 0.11.6",
"prost",
"rand",
"reqwest",
"thiserror",
@ -2623,7 +2614,7 @@ dependencies = [
"futures-util",
"generated_types",
"observability_deps",
"prost 0.11.6",
"prost",
"tonic",
"workspace-hack",
]
@ -2690,7 +2681,7 @@ dependencies = [
"paste",
"pin-project",
"predicate",
"prost 0.11.6",
"prost",
"rand",
"schema",
"service_grpc_catalog",
@ -2741,7 +2732,7 @@ dependencies = [
"paste",
"pin-project",
"predicate",
"prost 0.11.6",
"prost",
"rand",
"schema",
"service_grpc_catalog",
@ -2799,7 +2790,7 @@ dependencies = [
"paste",
"pin-project",
"predicate",
"prost 0.11.6",
"prost",
"rand",
"schema",
"service_grpc_catalog",
@ -3013,7 +3004,7 @@ dependencies = [
"metric_exporters",
"observability_deps",
"parking_lot 0.12.1",
"pprof 0.11.0",
"pprof",
"reqwest",
"serde",
"serde_json",
@ -3649,7 +3640,7 @@ dependencies = [
"mutable_batch",
"mutable_batch_lp",
"mutable_batch_pb",
"prost 0.11.6",
"prost",
]
[[package]]
@ -4034,7 +4025,7 @@ dependencies = [
"parquet",
"pbjson-types",
"predicate",
"prost 0.11.6",
"prost",
"schema",
"snafu",
"thiserror",
@ -4097,8 +4088,8 @@ checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24"
dependencies = [
"heck",
"itertools",
"prost 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-types",
]
[[package]]
@ -4111,8 +4102,8 @@ dependencies = [
"chrono",
"pbjson",
"pbjson-build",
"prost 0.11.6",
"prost-build 0.11.6",
"prost",
"prost-build",
"serde",
]
@ -4261,31 +4252,6 @@ version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "pprof"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f"
dependencies = [
"backtrace",
"cfg-if",
"findshlibs",
"inferno",
"libc",
"log",
"nix 0.24.3",
"once_cell",
"parking_lot 0.12.1",
"prost 0.10.4",
"prost-build 0.10.4",
"prost-derive 0.10.1",
"protobuf",
"smallvec",
"symbolic-demangle 9.2.1",
"tempfile",
"thiserror",
]
[[package]]
name = "pprof"
version = "0.11.0"
@ -4301,12 +4267,13 @@ dependencies = [
"nix 0.24.3",
"once_cell",
"parking_lot 0.12.1",
"prost 0.11.6",
"prost-build 0.11.6",
"prost-derive 0.11.6",
"prost",
"prost-build",
"prost-derive",
"protobuf",
"sha2",
"smallvec",
"symbolic-demangle 10.2.1",
"symbolic-demangle",
"tempfile",
"thiserror",
]
@ -4459,16 +4426,6 @@ dependencies = [
"unarray",
]
[[package]]
name = "prost"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
dependencies = [
"bytes",
"prost-derive 0.10.1",
]
[[package]]
name = "prost"
version = "0.11.6"
@ -4476,29 +4433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
dependencies = [
"bytes",
"prost-derive 0.11.6",
]
[[package]]
name = "prost-build"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
dependencies = [
"bytes",
"cfg-if",
"cmake",
"heck",
"itertools",
"lazy_static",
"log",
"multimap",
"petgraph",
"prost 0.10.4",
"prost-types 0.10.1",
"regex",
"tempfile",
"which",
"prost-derive",
]
[[package]]
@ -4515,27 +4450,14 @@ dependencies = [
"multimap",
"petgraph",
"prettyplease",
"prost 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-types",
"regex",
"syn",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "prost-derive"
version = "0.11.6"
@ -4549,16 +4471,6 @@ dependencies = [
"syn",
]
[[package]]
name = "prost-types"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
dependencies = [
"bytes",
"prost 0.10.4",
]
[[package]]
name = "prost-types"
version = "0.11.6"
@ -4566,7 +4478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788"
dependencies = [
"bytes",
"prost 0.11.6",
"prost",
]
[[package]]
@ -4607,7 +4519,7 @@ dependencies = [
"parquet_file",
"pin-project",
"predicate",
"prost 0.11.6",
"prost",
"rand",
"regex",
"schema",
@ -5193,7 +5105,7 @@ dependencies = [
"iox_query",
"metric",
"observability_deps",
"prost 0.11.6",
"prost",
"serde",
"serde_json",
"service_common",
@ -5225,7 +5137,7 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project",
"predicate",
"prost 0.11.6",
"prost",
"query_functions",
"regex",
"schema",
@ -5648,18 +5560,6 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "symbolic-common"
version = "9.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2"
dependencies = [
"debugid",
"memmap2",
"stable_deref_trait",
"uuid",
]
[[package]]
name = "symbolic-common"
version = "10.2.1"
@ -5672,25 +5572,15 @@ dependencies = [
"uuid",
]
[[package]]
name = "symbolic-demangle"
version = "9.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0"
dependencies = [
"cpp_demangle",
"rustc-demangle",
"symbolic-common 9.2.1",
]
[[package]]
name = "symbolic-demangle"
version = "10.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489"
dependencies = [
"cpp_demangle",
"rustc-demangle",
"symbolic-common 10.2.1",
"symbolic-common",
]
[[package]]
@ -5782,7 +5672,7 @@ dependencies = [
"observability_deps",
"once_cell",
"parking_lot 0.12.1",
"prost 0.11.6",
"prost",
"rand",
"regex",
"reqwest",
@ -6054,8 +5944,8 @@ dependencies = [
"hyper-timeout",
"percent-encoding",
"pin-project",
"prost 0.11.6",
"prost-derive 0.11.6",
"prost",
"prost-derive",
"tokio",
"tokio-stream",
"tokio-util",
@ -6074,7 +5964,7 @@ checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
dependencies = [
"prettyplease",
"proc-macro2",
"prost-build 0.11.6",
"prost-build",
"quote",
"syn",
]
@ -6087,7 +5977,7 @@ checksum = "a88aee666ef3a4d1ee46218bbc8e5f69bcf9cc27bf2e871d6b724d83f56d179f"
dependencies = [
"async-stream",
"bytes",
"prost 0.11.6",
"prost",
"tokio",
"tokio-stream",
"tonic",
@ -6100,8 +5990,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67494bad4dda4c9bffae901dfe14e2b2c0f760adb4706dc10beeb81799f7f7b2"
dependencies = [
"bytes",
"prost 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-types",
"tokio",
"tokio-stream",
"tonic",
@ -6475,7 +6365,7 @@ dependencies = [
"observability_deps",
"once_cell",
"parking_lot 0.12.1",
"prost 0.11.6",
"prost",
"regex",
"serde",
"snafu",
@ -6822,8 +6712,8 @@ dependencies = [
"parquet",
"phf_shared",
"predicates",
"prost 0.11.6",
"prost-types 0.11.6",
"prost",
"prost-types",
"rand",
"rand_core",
"regex",
@ -6884,7 +6774,7 @@ dependencies = [
"observability_deps",
"parking_lot 0.12.1",
"pin-project",
"prost 0.11.6",
"prost",
"rskafka",
"schema",
"tempfile",

2
ioxd_common/Cargo.toml
View File

@ -12,7 +12,7 @@ license.workspace = true
clap_blocks = { path = "../clap_blocks" }
data_types = { path = "../data_types" }
generated_types = { path = "../generated_types" }
heappy = { git = "https://github.com/mkmik/heappy", rev = "b98e7f7dc080d5d7972a134de0e01e999e68e350", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true }
heappy = { git = "https://github.com/mkmik/heappy", rev = "1d6ac77a4026fffce8680a7b31a9f6e9859b5e73", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true }
metric = { path = "../metric" }
metric_exporters = { path = "../metric_exporters" }
observability_deps = { path = "../observability_deps" }