From 2bf586e7fa2ee5a6d6749175f44b1fdbfabdbc67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:15:39 -0400 Subject: [PATCH] Bump itertools from 0.12.1 to 0.13.0 in /quickwit (#5102) * Bump itertools from 0.12.1 to 0.13.0 in /quickwit Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.12.1 to 0.13.0. - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0) --- updated-dependencies: - dependency-name: itertools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Replace deprecated `group_by` with `chunk_by` --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adrien Guillo --- quickwit/Cargo.lock | 32 +++++++++---------- quickwit/Cargo.toml | 2 +- quickwit/quickwit-cluster/src/cluster.rs | 4 +-- .../src/indexing_scheduler/mod.rs | 4 +-- quickwit/quickwit-search/src/fetch_docs.rs | 2 +- .../quickwit-serve/src/jaeger_api/model.rs | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 559e9ca339c..32dc1f46d11 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -5678,7 +5678,7 @@ dependencies = [ "futures", "humantime", "indicatif", - "itertools 0.12.1", + "itertools 0.13.0", "numfmt", "once_cell", "openssl-probe", @@ -5725,7 +5725,7 @@ dependencies = [ "bytesize", "chitchat", "futures", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "pin-project", "quickwit-common", @@ -5800,7 +5800,7 @@ dependencies = [ "hostname", "http 0.2.12", "hyper 0.14.28", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "pin-project", "pnet", @@ -5835,7 +5835,7 @@ dependencies = [ "http 0.2.12", "http-serde 1.1.3", "humantime", - "itertools 0.12.1", + "itertools 0.13.0", "json_comments", "new_string_template", "once_cell", @@ -5862,7 +5862,7 @@ dependencies = [ "async-trait", "fnv", "futures", - "itertools 0.12.1", + "itertools 0.13.0", "mockall", "once_cell", "proptest", @@ -5890,7 +5890,7 @@ name = "quickwit-datetime" version = "0.8.0" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "ouroboros", "serde", "serde_json", @@ -5927,7 +5927,7 @@ dependencies = [ "fnv", "hex", "indexmap 2.1.0", - "itertools 0.12.1", + "itertools 0.13.0", "matches", "nom", "once_cell", @@ -5955,7 +5955,7 @@ dependencies = [ "anyhow", "futures", "futures-util", - "itertools 0.12.1", + "itertools 0.13.0", "quickwit-common", "quickwit-config", "quickwit-indexing", @@ -5988,7 +5988,7 @@ dependencies = [ "google-cloud-gax", "google-cloud-googleapis", "google-cloud-pubsub", - "itertools 0.12.1", + "itertools 0.13.0", "libz-sys", "mockall", "once_cell", @@ -6039,7 +6039,7 @@ dependencies = [ "fail", "futures", "http 0.2.12", - "itertools 0.12.1", + "itertools 0.13.0", "mockall", "mrecordlog", "once_cell", @@ -6071,7 +6071,7 @@ dependencies = [ "anyhow", "futures-util", "hyper 0.14.28", - "itertools 0.12.1", + "itertools 0.13.0", "quickwit-actors", "quickwit-common", "quickwit-config", @@ -6093,7 +6093,7 @@ name = "quickwit-jaeger" version = "0.8.0" dependencies = [ "async-trait", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "prost", "prost-types", @@ -6127,7 +6127,7 @@ dependencies = [ "anyhow", "async-trait", "futures", - "itertools 0.12.1", + "itertools 0.13.0", "mockall", "once_cell", "quickwit-actors", @@ -6215,7 +6215,7 @@ dependencies = [ "dotenv", "futures", "http 0.2.12", - "itertools 0.12.1", + "itertools 0.13.0", "md5", "mockall", "once_cell", @@ -6367,7 +6367,7 @@ dependencies = [ "fnv", "futures", "http 0.2.12", - "itertools 0.12.1", + "itertools 0.13.0", "mockall", "once_cell", "postcard", @@ -6417,7 +6417,7 @@ dependencies = [ "http-serde 1.1.3", "humantime", "hyper 0.14.28", - "itertools 0.12.1", + "itertools 0.13.0", "mime_guess", "mockall", "once_cell", diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index f3dfee7f28c..cf2779e30ca 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -134,7 +134,7 @@ hyper = { version = "0.14", features = [ hyper-rustls = "0.24" indexmap = { version = "2.1.0", features = ["serde"] } indicatif = "0.17.3" -itertools = "0.12" +itertools = "0.13" json_comments = "0.2" libz-sys = "1.1.8" lru = "0.12" diff --git a/quickwit/quickwit-cluster/src/cluster.rs b/quickwit/quickwit-cluster/src/cluster.rs index 2b847f12c26..116297476b2 100644 --- a/quickwit/quickwit-cluster/src/cluster.rs +++ b/quickwit/quickwit-cluster/src/cluster.rs @@ -1113,13 +1113,13 @@ mod tests { let node_grouped_tasks: HashMap = node .indexing_tasks .iter() - .group_by(|task| (*task).clone()) + .chunk_by(|task| (*task).clone()) .into_iter() .map(|(key, group)| (key, group.count())) .collect(); let grouped_tasks: HashMap = indexing_tasks .iter() - .group_by(|task| (*task).clone()) + .chunk_by(|task| (*task).clone()) .into_iter() .map(|(key, group)| (key, group.count())) .collect(); diff --git a/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs b/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs index 3fca19ab936..0fc16189925 100644 --- a/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs +++ b/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs @@ -501,13 +501,13 @@ fn get_indexing_tasks_diff<'a>( let mut unplanned_tasks: Vec<&IndexingTask> = Vec::new(); let grouped_running_tasks: FnvHashMap<&IndexingTask, usize> = running_tasks .iter() - .group_by(|&task| task) + .chunk_by(|&task| task) .into_iter() .map(|(key, group)| (key, group.count())) .collect(); let grouped_last_applied_tasks: FnvHashMap<&IndexingTask, usize> = last_applied_tasks .iter() - .group_by(|&task| task) + .chunk_by(|&task| task) .into_iter() .map(|(key, group)| (key, group.count())) .collect(); diff --git a/quickwit/quickwit-search/src/fetch_docs.rs b/quickwit/quickwit-search/src/fetch_docs.rs index 2873a5d2c41..a261b3a01a8 100644 --- a/quickwit/quickwit-search/src/fetch_docs.rs +++ b/quickwit/quickwit-search/src/fetch_docs.rs @@ -62,7 +62,7 @@ async fn fetch_docs_to_map( global_doc_addrs.sort_by(|a, b| a.split.cmp(&b.split)); for (split_id, global_doc_addrs) in global_doc_addrs .iter() - .group_by(|global_doc_addr| global_doc_addr.split.as_str()) + .chunk_by(|global_doc_addr| global_doc_addr.split.as_str()) .into_iter() { let global_doc_addrs: Vec = diff --git a/quickwit/quickwit-serve/src/jaeger_api/model.rs b/quickwit/quickwit-serve/src/jaeger_api/model.rs index 2bbdf3a44e0..502e4d251a6 100644 --- a/quickwit/quickwit-serve/src/jaeger_api/model.rs +++ b/quickwit/quickwit-serve/src/jaeger_api/model.rs @@ -33,7 +33,7 @@ pub(super) const DEFAULT_NUMBER_OF_TRACES: i32 = 20; pub(super) fn build_jaeger_traces(spans: Vec) -> anyhow::Result> { let jaeger_traces: Vec = spans .into_iter() - .group_by(|span| span.trace_id.clone()) + .chunk_by(|span| span.trace_id.clone()) .into_iter() .map(|(span_id, group)| JaegerTrace::new(span_id, group.collect())) .collect();