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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 99c0a99b8fd branch-3.0: [Fix](Insert-Job)Resolving Task Status 
Discrepancies in Query Execution Records #45342 (#45405)
99c0a99b8fd is described below

commit 99c0a99b8fd41c13ae670f59f2449d732e840370
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 16 14:06:56 2024 +0800

    branch-3.0: [Fix](Insert-Job)Resolving Task Status Discrepancies in Query 
Execution Records #45342 (#45405)
    
    Cherry-picked from #45342
    
    Co-authored-by: Calvin Kirs <guoqi...@selectdb.com>
---
 .../main/java/org/apache/doris/job/extensions/insert/InsertTask.java  | 2 +-
 regression-test/suites/job_p0/test_base_insert_job.groovy             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertTask.java
 
b/fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertTask.java
index 23a367d5d6e..a577250dc86 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertTask.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertTask.java
@@ -244,7 +244,7 @@ public class InsertTask extends AbstractTask {
         trow.addToColumnValue(new 
TCell().setStringVal(String.valueOf(getJobId())));
         trow.addToColumnValue(new TCell().setStringVal(jobName));
         trow.addToColumnValue(new TCell().setStringVal(getJobId() + 
LABEL_SPLITTER + getTaskId()));
-        trow.addToColumnValue(new 
TCell().setStringVal(jobInfo.getState().name()));
+        trow.addToColumnValue(new TCell().setStringVal(getStatus().name()));
         trow.addToColumnValue(new TCell().setStringVal(getErrorMsg()));
         // create time
         trow.addToColumnValue(new 
TCell().setStringVal(TimeUtils.longToTimeString(getCreateTimeMs())));
diff --git a/regression-test/suites/job_p0/test_base_insert_job.groovy 
b/regression-test/suites/job_p0/test_base_insert_job.groovy
index 2bdf96cd5bd..33ae28443b2 100644
--- a/regression-test/suites/job_p0/test_base_insert_job.groovy
+++ b/regression-test/suites/job_p0/test_base_insert_job.groovy
@@ -116,7 +116,7 @@ suite("test_base_insert_job") {
 
     def taskStatus = sql """select status from tasks("type"="insert") where 
JobName ='${jobName}'"""
     for (int i = 0; i < taskStatus.size(); i++) {
-        assert taskStatus.get(i).get(0) =="CANCELED" || 
taskStatus.get(i).get(0) =="FINISHED"
+        assert taskStatus.get(i).get(0) =="CANCELED" || 
taskStatus.get(i).get(0) =="SUCCESS"
     }
     sql """
        CREATE JOB ${jobMixedName}  ON SCHEDULE every 1 second  DO insert into 
${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
@@ -168,7 +168,7 @@ suite("test_base_insert_job") {
     // table should have one record after job finished
     assert datas.size() == 1
     // one time job only has one task. when job finished, task status should 
be FINISHED
-    assert datas.get(0).get(0) == "FINISHED"
+    assert datas.get(0).get(0) == "SUCCESS"
     // check table data
     def dataCount1 = sql """select count(1) from ${tableName} where 
user_id=1001"""
     assert dataCount1.get(0).get(0) == 1


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

Reply via email to