executor: fix admin show ddl jobs end time bug when job is not finish…

…ed (#14738)
pingcap · Feb 12, 2020 · be434ba · be434ba
1 parent 77c7875
commit be434ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/executor/executor.go b/executor/executor.go
@@ -485,7 +485,11 @@ func (e *ShowDDLJobsExec) appendJobToChunk(req *chunk.Chunk, job *model.Job) {
 	req.AppendInt64(6, job.TableID)
 	req.AppendInt64(7, job.RowCount)
 	req.AppendString(8, model.TSConvert2Time(job.StartTS).String())
-	req.AppendString(9, model.TSConvert2Time(finishTS).String())
+	if finishTS > 0 {
+		req.AppendString(9, model.TSConvert2Time(finishTS).String())
+	} else {
+		req.AppendString(9, "")
+	}
 	req.AppendString(10, job.State.String())
 }
 

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -478,6 +478,7 @@ func (s *testSuiteP2) TestAdminShowDDLJobs(c *C) {
 	re = tk.MustQuery("admin show ddl jobs 1 where job_type='create table'")
 	row = re.Rows()[0]
 	c.Assert(row[1], Equals, "test_admin_show_ddl_jobs")
+	c.Assert(row[9], Equals, "")
 }
 
 func (s *testSuiteP2) TestAdminChecksumOfPartitionedTable(c *C) {