Skip to content

Commit

Permalink
branch-2.1 [Fix](Insert-Job)Resolving Task Status Discrepancies in Qu…
Browse files Browse the repository at this point in the history
…ery Execution Records (apache#45342)

(cherry picked from commit 41e554d)
apache#45432
  • Loading branch information
CalvinKirs committed Dec 16, 2024
1 parent d132411 commit 41a80a8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public TRow getTvfInfo(String jobName) {
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())));
Expand Down
8 changes: 3 additions & 5 deletions regression-test/suites/job_p0/test_base_insert_job.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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) =="CANCELLED" || 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');
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -202,8 +202,6 @@ suite("test_base_insert_job") {
def past_start_time_job = sql """ select status from jobs("type"="insert") where name='past_start_time'"""
println past_start_time_job
assert past_start_time_job.get(0).get(0) == "RUNNING"
def recurringTableDatas = sql """ select count(1) from ${tableName} where user_id=99 and type=99 """
assert recurringTableDatas.get(0).get(0) == 1
sql """
DROP JOB IF EXISTS where jobname = 'past_start_time'
"""
Expand Down Expand Up @@ -306,7 +304,7 @@ suite("test_base_insert_job") {
CREATE JOB test_error_starts ON SCHEDULE every -1 second comment 'test' DO insert into ${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
"""
} catch (Exception e) {
//ignore
assert e.getMessage().contains("expecting INTEGER_VALUE")
}

// test keyword as job name
Expand Down

0 comments on commit 41a80a8

Please sign in to comment.