Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/datacoord/import_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ type ImportJob interface {
GetState() internalpb.ImportJobState
GetReason() string
GetRequestedDiskSize() int64
GetStartTime() string
GetCreateTime() string
GetCompleteTime() string
GetFiles() []*internalpb.ImportFile
GetOptions() []*commonpb.KeyValuePair
Expand Down
6 changes: 3 additions & 3 deletions internal/datacoord/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -1898,7 +1898,7 @@ func (s *Server) ImportV2(ctx context.Context, in *internalpb.ImportRequestInter
if jobID == 0 {
jobID = idStart
}
startTime := time.Now()
createTime := time.Now()
job := &importJob{
ImportJob: &datapb.ImportJob{
JobID: jobID,
Expand All @@ -1912,7 +1912,7 @@ func (s *Server) ImportV2(ctx context.Context, in *internalpb.ImportRequestInter
State: internalpb.ImportJobState_Pending,
Files: files,
Options: in.GetOptions(),
StartTime: startTime.Format("2006-01-02T15:04:05Z07:00"),
CreateTime: createTime.Format("2006-01-02T15:04:05Z07:00"),
ReadyVchannels: in.GetChannelNames(),
DataTs: in.GetDataTimestamp(),
},
Expand Down Expand Up @@ -1961,7 +1961,7 @@ func (s *Server) GetImportProgress(ctx context.Context, in *internalpb.GetImport
resp.Reason = reason
resp.Progress = progress
resp.CollectionName = job.GetCollectionName()
resp.StartTime = job.GetStartTime()
resp.CreateTime = job.GetCreateTime()
resp.CompleteTime = job.GetCompleteTime()
resp.ImportedRows = importedRows
resp.TotalRows = totalRows
Expand Down
1 change: 1 addition & 0 deletions internal/distributed/proxy/httpserver/handler_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -2737,6 +2737,7 @@ func (h *HandlersV2) getImportJobProcess(ctx context.Context, c *gin.Context, an
response := resp.(*internalpb.GetImportProgressResponse)
returnData := make(map[string]interface{})
returnData["jobId"] = jobIDGetter.GetJobID()
returnData["createTime"] = response.GetCreateTime()
returnData["collectionName"] = response.GetCollectionName()
returnData["completeTime"] = response.GetCompleteTime()
returnData["state"] = response.GetState().String()
Expand Down
2 changes: 1 addition & 1 deletion internal/proxy/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -4601,7 +4601,7 @@ func convertToV1GetImportResponse(rsp *internalpb.GetImportProgressResponse) *mi
Value: strconv.FormatInt(rsp.GetProgress(), 10),
})
var createTs int64
createTime, err := time.Parse("2006-01-02T15:04:05Z07:00", rsp.GetStartTime())
createTime, err := time.Parse("2006-01-02T15:04:05Z07:00", rsp.GetCreateTime())
if err == nil {
createTs = createTime.Unix()
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/proto/data_coord.proto
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ message ImportJob {
string complete_time = 13;
repeated internal.ImportFile files = 14;
repeated common.KeyValuePair options = 15;
string start_time = 16;
string create_time = 16;
repeated string ready_vchannels = 17;
uint64 data_ts = 18;
}
Expand Down
1,366 changes: 683 additions & 683 deletions pkg/proto/datapb/data_coord.pb.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/proto/internal.proto
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ message GetImportProgressResponse {
repeated ImportTaskProgress task_progresses = 7;
int64 imported_rows = 8;
int64 total_rows = 9;
string start_time = 10;
string create_time = 10;
}

message ListImportsRequestInternal {
Expand Down
256 changes: 128 additions & 128 deletions pkg/proto/internalpb/internal.pb.go

Large diffs are not rendered by default.

Loading