Skip to content

Commit 8d11373

Browse files
authored
enhance: Show create time for import job (#45058)
issue: #45056 Signed-off-by: bigsheeper <[email protected]>
1 parent 9d29e6e commit 8d11373

File tree

8 files changed

+819
-818
lines changed

8 files changed

+819
-818
lines changed

internal/datacoord/import_job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ type ImportJob interface {
118118
GetState() internalpb.ImportJobState
119119
GetReason() string
120120
GetRequestedDiskSize() int64
121-
GetStartTime() string
121+
GetCreateTime() string
122122
GetCompleteTime() string
123123
GetFiles() []*internalpb.ImportFile
124124
GetOptions() []*commonpb.KeyValuePair

internal/datacoord/services.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ func (s *Server) ImportV2(ctx context.Context, in *internalpb.ImportRequestInter
18981898
if jobID == 0 {
18991899
jobID = idStart
19001900
}
1901-
startTime := time.Now()
1901+
createTime := time.Now()
19021902
job := &importJob{
19031903
ImportJob: &datapb.ImportJob{
19041904
JobID: jobID,
@@ -1912,7 +1912,7 @@ func (s *Server) ImportV2(ctx context.Context, in *internalpb.ImportRequestInter
19121912
State: internalpb.ImportJobState_Pending,
19131913
Files: files,
19141914
Options: in.GetOptions(),
1915-
StartTime: startTime.Format("2006-01-02T15:04:05Z07:00"),
1915+
CreateTime: createTime.Format("2006-01-02T15:04:05Z07:00"),
19161916
ReadyVchannels: in.GetChannelNames(),
19171917
DataTs: in.GetDataTimestamp(),
19181918
},
@@ -1961,7 +1961,7 @@ func (s *Server) GetImportProgress(ctx context.Context, in *internalpb.GetImport
19611961
resp.Reason = reason
19621962
resp.Progress = progress
19631963
resp.CollectionName = job.GetCollectionName()
1964-
resp.StartTime = job.GetStartTime()
1964+
resp.CreateTime = job.GetCreateTime()
19651965
resp.CompleteTime = job.GetCompleteTime()
19661966
resp.ImportedRows = importedRows
19671967
resp.TotalRows = totalRows

internal/distributed/proxy/httpserver/handler_v2.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,6 +2737,7 @@ func (h *HandlersV2) getImportJobProcess(ctx context.Context, c *gin.Context, an
27372737
response := resp.(*internalpb.GetImportProgressResponse)
27382738
returnData := make(map[string]interface{})
27392739
returnData["jobId"] = jobIDGetter.GetJobID()
2740+
returnData["createTime"] = response.GetCreateTime()
27402741
returnData["collectionName"] = response.GetCollectionName()
27412742
returnData["completeTime"] = response.GetCompleteTime()
27422743
returnData["state"] = response.GetState().String()

internal/proxy/impl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4601,7 +4601,7 @@ func convertToV1GetImportResponse(rsp *internalpb.GetImportProgressResponse) *mi
46014601
Value: strconv.FormatInt(rsp.GetProgress(), 10),
46024602
})
46034603
var createTs int64
4604-
createTime, err := time.Parse("2006-01-02T15:04:05Z07:00", rsp.GetStartTime())
4604+
createTime, err := time.Parse("2006-01-02T15:04:05Z07:00", rsp.GetCreateTime())
46054605
if err == nil {
46064606
createTs = createTime.Unix()
46074607
}

pkg/proto/data_coord.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ message ImportJob {
990990
string complete_time = 13;
991991
repeated internal.ImportFile files = 14;
992992
repeated common.KeyValuePair options = 15;
993-
string start_time = 16;
993+
string create_time = 16;
994994
repeated string ready_vchannels = 17;
995995
uint64 data_ts = 18;
996996
}

pkg/proto/datapb/data_coord.pb.go

Lines changed: 683 additions & 683 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/proto/internal.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ message GetImportProgressResponse {
388388
repeated ImportTaskProgress task_progresses = 7;
389389
int64 imported_rows = 8;
390390
int64 total_rows = 9;
391-
string start_time = 10;
391+
string create_time = 10;
392392
}
393393

394394
message ListImportsRequestInternal {

pkg/proto/internalpb/internal.pb.go

Lines changed: 128 additions & 128 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)