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

Merge branch 'main' into kayagokalp/7764

pull/24376/head
Dom 2023-05-15 11:01:08 +01:00 committed by GitHub
parent cb0fb92d86 9c5028676e
commit 6257918d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Cargo.lock generated
View File

@ -2173,9 +2173,9 @@ dependencies = [
[[package]]
name = "handlebars"
version = "4.3.6"
version = "4.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
dependencies = [
"log",
"pest",
@ -4159,22 +4159,22 @@ dependencies = [
[[package]]
name = "pin-project"
version = "1.0.12"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.0.12"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.15",
]
[[package]]
@ -4936,18 +4936,18 @@ checksum = "e6b44e8fc93a14e66336d230954dda83d18b4605ccace8fe09bc7514a71ad0bc"
[[package]]
name = "serde"
version = "1.0.162"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.162"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
@ -5748,9 +5748,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.28.0"
version = "1.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
dependencies = [
"autocfg",
"bytes",
@ -6063,9 +6063,9 @@ dependencies = [
[[package]]
name = "tracing-core"
version = "0.1.30"
version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",

4
data_types/src/columns.rs
View File

@ -1,6 +1,6 @@
//! Types having to do with columns.
use super::{ChunkId, TableId};
use super::TableId;
use influxdb_line_protocol::FieldValue;
use schema::{builder::SchemaBuilder, InfluxColumnType, InfluxFieldType, Schema};
use sqlx::postgres::PgHasArrayType;
@ -328,7 +328,7 @@ impl ColumnSet {
/// Estimate the memory consumption of this object and its contents
pub fn size(&self) -> usize {
std::mem::size_of_val(self) + (std::mem::size_of::<ChunkId>() * self.0.capacity())
std::mem::size_of_val(self) + (std::mem::size_of::<ColumnId>() * self.0.capacity())
}
}

2
datafusion_util/Cargo.toml
View File

@ -12,7 +12,7 @@ datafusion = { workspace = true }
futures = "0.3"
object_store = "0.5.6"
observability_deps = { path = "../observability_deps" }
pin-project = "1.0"
pin-project = "1.1"
tokio = { version = "1.28", features = ["parking_lot", "sync"] }
tokio-stream = "0.1"
url = "2.2"

2
executor/Cargo.toml
View File

@ -10,7 +10,7 @@ futures = "0.3"
observability_deps = { path = "../observability_deps" }
once_cell = { version = "1.17", features = ["parking_lot"] }
parking_lot = "0.12"
pin-project = "1.0"
pin-project = "1.1"
tokio = { version = "1.28" }
tokio-util = { version = "0.7.8" }
workspace-hack = { version = "0.1", path = "../workspace-hack" }

2
grpc-binary-logger/Cargo.toml
View File

@ -13,7 +13,7 @@ futures = "0.3"
http = "0.2"
http-body = "0.4"
hyper = "0.14"
pin-project = "1.0"
pin-project = "1.1"
prost = "0.11"
tokio = {version = "1", features = [ "rt" ]}
tonic = { workspace = true }

2
influxdb_iox/Cargo.toml
View File

@ -84,7 +84,7 @@ assert_matches = "1.5"
async-trait = "0.1"
predicate = { path = "../predicate" }
predicates = "3.0.3"
serde = "1.0.162"
serde = "1.0.163"
test_helpers = { path = "../test_helpers", features = ["future_timeout"] }
test_helpers_end_to_end = { path = "../test_helpers_end_to_end" }
insta = { version = "1", features = ["yaml"] }

2
ingester/Cargo.toml
View File

@ -33,7 +33,7 @@ observability_deps = { version = "0.1.0", path = "../observability_deps" }
once_cell = "1.17"
parking_lot = "0.12.1"
parquet_file = { version = "0.1.0", path = "../parquet_file" }
pin-project = "1.0.12"
pin-project = "1.1.0"
predicate = { version = "0.1.0", path = "../predicate" }
prost = { version = "0.11.9", default-features = false, features = ["std"] }
rand = "0.8.5"

2
iox_data_generator/Cargo.toml
View File

@ -12,7 +12,7 @@ chrono = { version = "0.4", default-features = false }
clap = { version = "4", features = ["derive", "env", "cargo"] }
datafusion_util = { path = "../datafusion_util" }
futures = "0.3"
handlebars = "4.3.6"
handlebars = "4.3.7"
humantime = "2.1.0"
influxdb2_client = { path = "../influxdb2_client" }
itertools = "0.10.5"

2
object_store_metrics/Cargo.toml
View File

@ -12,7 +12,7 @@ futures = "0.3"
iox_time = { version = "0.1.0", path = "../iox_time" }
metric = { version = "0.1.0", path = "../metric" }
object_store = "0.5.6"
pin-project = "1.0.12"
pin-project = "1.1.0"
tokio = { version = "1.28", features = ["io-util"] }
workspace-hack = { version = "0.1", path = "../workspace-hack" }

2
querier/Cargo.toml
View File

@ -27,7 +27,7 @@ object_store = "0.5.6"
observability_deps = { path = "../observability_deps" }
parking_lot = "0.12"
parquet_file = { path = "../parquet_file" }
pin-project = "1.0"
pin-project = "1.1"
predicate = { path = "../predicate" }
prost = { version = "0.11" }
rand = "0.8.3"

4
querier/src/cache/parquet_file.rs vendored
View File

@ -347,8 +347,8 @@ mod tests {
partition.create_parquet_file(builder).await;
let table_id = table.table.id;
let single_file_size = 216;
let two_file_size = 392;
let single_file_size = 200;
let two_file_size = 360;
assert!(single_file_size < two_file_size);
let cache = make_cache(&catalog);

2
service_grpc_influxrpc/Cargo.toml
View File

@ -25,7 +25,7 @@ tracker = { path = "../tracker" }
arrow = { workspace = true, features = ["prettyprint"] }
async-trait = "0.1"
futures = "0.3"
pin-project = "1.0"
pin-project = "1.1"
prost = "0.11"
regex = "1.8.1"
serde = { version = "1.0", features = ["derive"] }

2
test_helpers/Cargo.toml
View File

@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
observability_deps = { path = "../observability_deps" }
workspace-hack = { version = "0.1", path = "../workspace-hack" }
async-trait = { version = "0.1.68", optional = true }
tokio = { version = "1.28.0", optional = true, default_features = false, features = ["time"] }
tokio = { version = "1.28.1", optional = true, default_features = false, features = ["time"] }
[features]
default = []

2
trace_http/Cargo.toml
View File

@ -16,7 +16,7 @@ itertools = "0.10"
metric = { path = "../metric" }
observability_deps = { path = "../observability_deps" }
parking_lot = "0.12"
pin-project = "1.0"
pin-project = "1.1"
snafu = "0.7"
tower = "0.4"
workspace-hack = { version = "0.1", path = "../workspace-hack" }

2
tracker/Cargo.toml
View File

@ -13,7 +13,7 @@ lock_api = "0.4.9"
metric = { path = "../metric" }
observability_deps = { path = "../observability_deps" }
parking_lot = "0.12"
pin-project = "1.0"
pin-project = "1.1"
iox_time = { path = "../iox_time" }
tokio = { version = "1.28", features = ["macros", "parking_lot", "sync", "time"] }
tokio-util = { version = "0.7.8" }

2
workspace-hack/Cargo.toml
View File

@ -146,7 +146,7 @@ sha2 = { version = "0.10" }
smallvec = { version = "1", default-features = false, features = ["union"] }
sqlx-core = { version = "0.6", default-features = false, features = ["any", "migrate", "postgres", "runtime-tokio-rustls", "sqlite", "uuid"] }
sqlx-macros = { version = "0.6", default-features = false, features = ["json", "migrate", "postgres", "runtime-tokio-rustls", "sqlite", "uuid"] }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit-mut"] }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit-mut"] }
tokio = { version = "1", features = ["full", "test-util", "tracing"] }
tokio-stream = { version = "0.1", features = ["fs", "net"] }