From aa10fe700ca5b0490eef7fbcb39999989fb7f806 Mon Sep 17 00:00:00 2001 From: Lordworms Date: Thu, 24 Oct 2024 22:40:10 -0700 Subject: [PATCH] fix ci --- datafusion-cli/Cargo.lock | 4 ++-- datafusion/optimizer/Cargo.toml | 2 +- datafusion/physical-plan/Cargo.toml | 2 +- datafusion/physical-plan/src/joins/hash_join.rs | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index 444ea4a35685a..783d8becf45a4 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -1469,8 +1469,8 @@ dependencies = [ "async-trait", "chrono", "datafusion-common", - "datafusion-functions-aggregate", "datafusion-expr", + "datafusion-functions-aggregate", "datafusion-physical-expr", "hashbrown 0.14.5", "indexmap", @@ -1548,11 +1548,11 @@ dependencies = [ "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", + "datafusion-functions-aggregate", "datafusion-functions-aggregate-common", "datafusion-functions-window-common", "datafusion-physical-expr", "datafusion-physical-expr-common", - "datafusion-functions-aggregate", "futures", "half", "hashbrown 0.14.5", diff --git a/datafusion/optimizer/Cargo.toml b/datafusion/optimizer/Cargo.toml index 6c5763e7eebd5..422751a9269ff 100644 --- a/datafusion/optimizer/Cargo.toml +++ b/datafusion/optimizer/Cargo.toml @@ -40,8 +40,8 @@ arrow = { workspace = true } async-trait = { workspace = true } chrono = { workspace = true } datafusion-common = { workspace = true, default-features = true } -datafusion-functions-aggregate = { workspace = true } datafusion-expr = { workspace = true } +datafusion-functions-aggregate = { workspace = true } datafusion-physical-expr = { workspace = true } hashbrown = { workspace = true } indexmap = { workspace = true } diff --git a/datafusion/physical-plan/Cargo.toml b/datafusion/physical-plan/Cargo.toml index 9bdbd0792301f..fe87415bfa312 100644 --- a/datafusion/physical-plan/Cargo.toml +++ b/datafusion/physical-plan/Cargo.toml @@ -51,11 +51,11 @@ datafusion-common = { workspace = true, default-features = true } datafusion-common-runtime = { workspace = true, default-features = true } datafusion-execution = { workspace = true } datafusion-expr = { workspace = true } +datafusion-functions-aggregate = { workspace = true } datafusion-functions-aggregate-common = { workspace = true } datafusion-functions-window-common = { workspace = true } datafusion-physical-expr = { workspace = true, default-features = true } datafusion-physical-expr-common = { workspace = true } -datafusion-functions-aggregate = { workspace = true } futures = { workspace = true } half = { workspace = true } hashbrown = { workspace = true } diff --git a/datafusion/physical-plan/src/joins/hash_join.rs b/datafusion/physical-plan/src/joins/hash_join.rs index 3049d671fb01d..1cbb294fe8cd3 100644 --- a/datafusion/physical-plan/src/joins/hash_join.rs +++ b/datafusion/physical-plan/src/joins/hash_join.rs @@ -1365,7 +1365,6 @@ impl HashJoinStream { // If the filter is not finalized after this merge, we need to wait if !filter_finalized { - let _ = tokio::time::sleep_until(Instant::now() + Duration::from_millis(5)); cx.waker().wake_by_ref(); return Poll::Pending; }