(doris) 01/02: [Bug](load) fix s3 load not display the progress info (#35719)

[yiguolei]

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

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

commit 8df1a3c84948bd40ce25f3e237facc94175f1e69
Author: zhangstar333 <87313068+zhangstar...@users.noreply.github.com>
AuthorDate: Sat Jun 1 11:22:35 2024 +0800

    [Bug](load) fix s3 load not display the progress info (#35719)
    
    ## Proposed changes
    should display the load progress info, so the user could know it loading
    step.
    ```
             JobId: 49088
             Label: rpt_10002184_syqzzywqkb10
             State: FINISHED
          Progress: 100.00% (10/10)
    ```
    
    
    <!--Describe your changes.-->
---
 be/src/runtime/fragment_mgr.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 7003f1d49f5..ade9a885aae 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -218,7 +218,6 @@ void FragmentMgr::coordinator_callback(const 
ReportStatusRequest& req) {
     params.__set_status(exec_status.to_thrift());
     params.__set_done(req.done);
     params.__set_query_type(req.runtime_state->query_type());
-    params.__set_finished_scan_ranges(req.runtime_state->num_finished_range());
 
     DCHECK(req.runtime_state != nullptr);
 
@@ -296,23 +295,29 @@ void FragmentMgr::coordinator_callback(const 
ReportStatusRequest& req) {
         int64_t num_rows_load_success = 0;
         int64_t num_rows_load_filtered = 0;
         int64_t num_rows_load_unselected = 0;
+        int64_t num_finished_ranges = 0;
         if (req.runtime_state->num_rows_load_total() > 0 ||
-            req.runtime_state->num_rows_load_filtered() > 0) {
+            req.runtime_state->num_rows_load_filtered() > 0 ||
+            req.runtime_state->num_finished_range() > 0) {
             params.__isset.load_counters = true;
 
             num_rows_load_success = req.runtime_state->num_rows_load_success();
             num_rows_load_filtered = 
req.runtime_state->num_rows_load_filtered();
             num_rows_load_unselected = 
req.runtime_state->num_rows_load_unselected();
+            num_finished_ranges = req.runtime_state->num_finished_range();
         } else if (!req.runtime_states.empty()) {
             for (auto* rs : req.runtime_states) {
-                if (rs->num_rows_load_total() > 0 || 
rs->num_rows_load_filtered() > 0) {
+                if (rs->num_rows_load_total() > 0 || 
rs->num_rows_load_filtered() > 0 ||
+                    req.runtime_state->num_finished_range() > 0) {
                     params.__isset.load_counters = true;
                     num_rows_load_success += rs->num_rows_load_success();
                     num_rows_load_filtered += rs->num_rows_load_filtered();
                     num_rows_load_unselected += rs->num_rows_load_unselected();
+                    num_finished_ranges += rs->num_finished_range();
                 }
             }
         }
+        params.__set_finished_scan_ranges(num_finished_ranges);
         params.load_counters.emplace(s_dpp_normal_all, 
std::to_string(num_rows_load_success));
         params.load_counters.emplace(s_dpp_abnormal_all, 
std::to_string(num_rows_load_filtered));
         params.load_counters.emplace(s_unselected_rows, 
std::to_string(num_rows_load_unselected));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org