Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: avoid panic when upstream input is closed for lookup #8529

Merged
merged 1 commit into from
Mar 14, 2023
Merged

fix: avoid panic when upstream input is closed for lookup #8529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/stream/src/executor/lookup/sides.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use anyhow::Context;
use either::Either;
use futures::stream::PollNext;
use futures::StreamExt;
Expand Down Expand Up @@ -247,7 +248,7 @@ pub async fn stream_lookup_arrange_prev_epoch(
match input
.next()
.await
.expect("unexpected close of barrier aligner")?
.context("unexpected close of barrier aligner")??
{
Either::Left(Message::Watermark(_)) => {
todo!("https://github.com/risingwavelabs/risingwave/issues/6042")
Expand Down Expand Up @@ -298,7 +299,7 @@ pub async fn stream_lookup_arrange_this_epoch(
match input
.next()
.await
.expect("unexpected close of barrier aligner")?
.context("unexpected close of barrier aligner")??
{
Either::Left(Message::Chunk(msg)) => {
// Should wait until arrangement from this epoch is available.
Expand Down Expand Up @@ -333,7 +334,7 @@ pub async fn stream_lookup_arrange_this_epoch(
match input
.next()
.await
.expect("unexpected close of barrier aligner")?
.context("unexpected close of barrier aligner")??
{
Either::Left(Message::Chunk(msg)) => yield ArrangeMessage::Stream(msg),
Either::Left(Message::Barrier(b)) => {
Expand All @@ -355,7 +356,7 @@ pub async fn stream_lookup_arrange_this_epoch(
match input
.next()
.await
.expect("unexpected close of barrier aligner")?
.context("unexpected close of barrier aligner")??
{
Either::Left(_) => unreachable!(),
Either::Right(Message::Chunk(chunk)) => {
Expand Down