This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 52609b92a75 branch-4.0: [chore](topn) check column type before merging
lazy materialization columns #61633 (#61667)
52609b92a75 is described below
commit 52609b92a7526d4e5fc36ad6ef0118bb6aee003e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 25 10:22:28 2026 +0800
branch-4.0: [chore](topn) check column type before merging lazy
materialization columns #61633 (#61667)
Cherry-picked from #61633
Co-authored-by: TengJianPing <[email protected]>
---
be/src/pipeline/exec/materialization_opertor.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/be/src/pipeline/exec/materialization_opertor.cpp
b/be/src/pipeline/exec/materialization_opertor.cpp
index c2030adb4ae..e040e35d7f6 100644
--- a/be/src/pipeline/exec/materialization_opertor.cpp
+++ b/be/src/pipeline/exec/materialization_opertor.cpp
@@ -81,6 +81,14 @@ Status MaterializationSharedState::merge_multi_response() {
}
}
+ // return error if any column in response block is not compatible with
source block column
+ for (int k = 0; k < response_blocks[i].columns(); ++k) {
+ const auto& resp_col_type =
response_blocks[i].get_datatype_by_position(k);
+ for (const auto& [_, source_block_rows] : block_maps) {
+ RETURN_IF_ERROR(resp_col_type->check_column(
+ *source_block_rows.first.get_by_position(k).column));
+ }
+ }
for (int j = 0; j < block_order_results[i].size(); ++j) {
auto backend_id = block_order_results[i][j];
if (backend_id) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
