This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-4.1 by this push:
     new 6ba1364db92 branch-4.1: [fix](cloud) Fix SchemaVariablesScanner crash 
due to incomplete FE response #65994 (#66015)
6ba1364db92 is described below

commit 6ba1364db92f035a5099a9c6b66d147139c9a493
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jul 30 08:55:47 2026 +0800

    branch-4.1: [fix](cloud) Fix SchemaVariablesScanner crash due to incomplete 
FE response #65994 (#66015)
    
    Cherry-picked from #65994
    
    Co-authored-by: deardeng <[email protected]>
---
 be/src/information_schema/schema_variables_scanner.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/be/src/information_schema/schema_variables_scanner.cpp 
b/be/src/information_schema/schema_variables_scanner.cpp
index acc85bec816..57b515cab91 100644
--- a/be/src/information_schema/schema_variables_scanner.cpp
+++ b/be/src/information_schema/schema_variables_scanner.cpp
@@ -86,6 +86,15 @@ Status 
SchemaVariablesScanner::get_next_block_internal(Block* block, bool* eos)
 
 Status SchemaVariablesScanner::_fill_block_impl(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]

Reply via email to