This is an automated email from the ASF dual-hosted git repository.
morningman 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 98563afea0f branch-4.0: [fix](cloud) Fix SchemaVariablesScanner crash
due to incomplete FE response #65994 (#66014)
98563afea0f is described below
commit 98563afea0f3511c416aa90e66bffcaa340b6e39
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 28 17:04:44 2026 +0800
branch-4.0: [fix](cloud) Fix SchemaVariablesScanner crash due to incomplete
FE response #65994 (#66014)
Cherry-picked from #65994
Co-authored-by: deardeng <[email protected]>
---
be/src/exec/schema_scanner/schema_variables_scanner.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/be/src/exec/schema_scanner/schema_variables_scanner.cpp
b/be/src/exec/schema_scanner/schema_variables_scanner.cpp
index ad4d5d072cb..01f5a2ed622 100644
--- a/be/src/exec/schema_scanner/schema_variables_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_variables_scanner.cpp
@@ -88,6 +88,15 @@ Status
SchemaVariablesScanner::get_next_block_internal(vectorized::Block* block,
Status SchemaVariablesScanner::_fill_block_impl(vectorized::Block* block) {
SCOPED_TIMER(_fill_block_timer);
+ constexpr int num_columns = 4;
+ for (const auto& row : _var_result.variables) {
+ if (row.size() < num_columns) {
+ return Status::InternalError(
+ "Incomplete variable entry from FE (expected {} fields,
got {}), "
+ "please retry",
+ num_columns, row.size());
+ }
+ }
auto row_num = _var_result.variables.size();
std::vector<void*> datas(row_num);
// variables names
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
