From d06409b056190ff963ad30fc3b37f3b9dab0cbf3 Mon Sep 17 00:00:00 2001 From: Jerry Hu Date: Tue, 18 Jun 2024 10:43:50 +0800 Subject: [PATCH] [fix](be) return correct canceled status from scanner (#36392) --- be/src/pipeline/exec/scan_operator.cpp | 2 +- be/src/vec/exec/scan/scanner_context.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/be/src/pipeline/exec/scan_operator.cpp b/be/src/pipeline/exec/scan_operator.cpp index 61543a170fcb84..39a57bee25b6fc 100644 --- a/be/src/pipeline/exec/scan_operator.cpp +++ b/be/src/pipeline/exec/scan_operator.cpp @@ -1498,7 +1498,7 @@ Status ScanOperatorX::get_block(RuntimeState* state, vectorized: if (local_state._scanner_ctx) { local_state._scanner_ctx->stop_scanners(state); } - return Status::Cancelled("Query cancelled in ScanOperator"); + return Status::Cancelled(state->cancel_reason()); } if (local_state._eos) { diff --git a/be/src/vec/exec/scan/scanner_context.cpp b/be/src/vec/exec/scan/scanner_context.cpp index 632c92f7a810a4..19a645c1a95928 100644 --- a/be/src/vec/exec/scan/scanner_context.cpp +++ b/be/src/vec/exec/scan/scanner_context.cpp @@ -254,7 +254,7 @@ Status ScannerContext::get_block_from_queue(RuntimeState* state, vectorized::Blo bool* eos, int id, bool wait) { if (state->is_cancelled()) { _set_scanner_done(); - return Status::Cancelled("Query cancelled in ScannerContext"); + return Status::Cancelled(state->cancel_reason()); } std::unique_lock l(_transfer_lock); // Wait for block from queue