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

Merge branch 'main' into sgc/issue/7829_time_bounds_3

pull/24376/head
Stuart Carnie 2023-06-07 08:51:38 +10:00
parent 3de03d02c5 a2f5f37b2e
commit c18902b05e
No known key found for this signature in database
GPG Key ID: 848D9C9718D78B4F
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -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",
@ -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",

8
influxdb_iox/tests/query_tests/sql_errors.rs
View File

@ -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;

2
tracker/Cargo.toml
View File

@ -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"

4
workspace-hack/Cargo.toml
View File

@ -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" }