From 8a06483e3ba68f70427e8e4de1381987b3039a64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 02:02:37 +0000 Subject: [PATCH 1/3] chore(deps): Bump clap from 4.3.1 to 4.3.2 Bumps [clap](https://github.com/clap-rs/clap) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.3.1...v4.3.2) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbed8ec598..e26657b57f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -857,9 +857,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" +checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" dependencies = [ "clap_builder", "clap_derive", @@ -903,9 +903,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", From c0a683b9f269ddad55ff37a70afb6a8daa357e79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 12:45:25 +0000 Subject: [PATCH 2/3] chore(deps): Bump lock_api from 0.4.9 to 0.4.10 (#7932) * chore(deps): Bump lock_api from 0.4.9 to 0.4.10 Bumps [lock_api](https://github.com/Amanieu/parking_lot) from 0.4.9 to 0.4.10. - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](https://github.com/Amanieu/parking_lot/compare/lock_api-0.4.9...lock_api-0.4.10) --- updated-dependencies: - dependency-name: lock_api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: Run cargo hakari tasks --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: CircleCI[bot] Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- tracker/Cargo.toml | 2 +- workspace-hack/Cargo.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e26657b57f..49d7bfba39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3335,9 +3335,9 @@ checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", diff --git a/tracker/Cargo.toml b/tracker/Cargo.toml index 6765b12664..00be673475 100644 --- a/tracker/Cargo.toml +++ b/tracker/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true [dependencies] futures = "0.3" hashbrown = { workspace = true } -lock_api = "0.4.9" +lock_api = "0.4.10" metric = { path = "../metric" } observability_deps = { path = "../observability_deps" } parking_lot = "0.12" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index c8370fc133..9f3c88bf8c 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -50,7 +50,7 @@ hashbrown = { version = "0.13", features = ["raw"] } indexmap = { version = "1", default-features = false, features = ["std"] } itertools = { version = "0.10" } libc = { version = "0.2", features = ["extra_traits"] } -lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] } +lock_api = { version = "0.4", features = ["arc_lock"] } log = { version = "0.4", default-features = false, features = ["std"] } md-5 = { version = "0.10" } memchr = { version = "2" } @@ -126,7 +126,7 @@ heck = { version = "0.4", features = ["unicode"] } indexmap = { version = "1", default-features = false, features = ["std"] } itertools = { version = "0.10" } libc = { version = "0.2", features = ["extra_traits"] } -lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] } +lock_api = { version = "0.4", features = ["arc_lock"] } log = { version = "0.4", default-features = false, features = ["std"] } md-5 = { version = "0.10" } memchr = { version = "2" } From a2f5f37b2e372678bd5506c608e20e589fdb0d08 Mon Sep 17 00:00:00 2001 From: Nga Tran Date: Tue, 6 Jun 2023 11:50:54 -0400 Subject: [PATCH 3/3] test: turn interval 0 test on after upgrading DF with the fix (#7938) * test: turn interval 0 test on after upgrading DF with the fix * chore: remove obsolete comments --- influxdb_iox/tests/query_tests/sql_errors.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/influxdb_iox/tests/query_tests/sql_errors.rs b/influxdb_iox/tests/query_tests/sql_errors.rs index f03fcf5f12..01c0d7a268 100644 --- a/influxdb_iox/tests/query_tests/sql_errors.rs +++ b/influxdb_iox/tests/query_tests/sql_errors.rs @@ -5,17 +5,13 @@ use observability_deps::tracing::*; use test_helpers_end_to_end::{maybe_skip_integration, MiniCluster, Step, StepTest}; // This is a reproducer of https://github.com/influxdata/idpe/issues/17644 -// It should be fixed to throw a different error message rather than a panic -// Ignore the test here because the "task 79 panicked" is not deterministic. It return different number everytime. -// After the issue is fixed with a proper error message, this test should be enabled. -#[ignore] #[tokio::test] async fn date_bin_interval_0() { SqlErrorTest { setup_name: "OneMeasurementTwoSeries", sql: "SELECT date_bin(INTERVAL '0 second', time) as month, count(cpu.user) from cpu where time between timestamp '2000-05-05T12:00:00Z' and timestamp '2000-05-05T12:59:00Z' group by month;", - expected_error_code: tonic::Code::Internal, - expected_message: "Join Error\ncaused by\nExternal error: task 79 panicked", + expected_error_code: tonic::Code::InvalidArgument, + expected_message: "External error: Execution error: DATE_BIN stride must be non-zero", } .run() .await;