Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance: Enhance and modify the return content of ImportV2 #31192

Merged
merged 8 commits into from
Mar 13, 2024

Conversation

bigsheeper
Copy link
Contributor

  1. The Import APIs now provide detailed progress information for each imported file, including details such as file name, file size, progress, and more.
  2. The APIs now return the collection name and the completion time.
  3. Other modifications include changing jobID to jobId and other similar adjustments.

issue: #28521

@sre-ci-robot sre-ci-robot added the size/L Denotes a PR that changes 100-499 lines. label Mar 12, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement labels Mar 12, 2024
Copy link
Contributor

mergify bot commented Mar 12, 2024

@bigsheeper E2e jenkins job failed, comment /run-cpu-e2e can trigger the job again.

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
@bigsheeper
Copy link
Contributor Author

bigsheeper commented Mar 12, 2024

Import response body example:

{
   "code":200,
   "data":{
      "jobId":"448325305307123865"
   }
}

ListImports response body example:

{
   "code":200,
   "data":{
      "records":[
         {
            "collectionName":"AAA",
            "jobId":"448326802088133601",
            "progress":50,
            "state":"Importing"
         },
         {
            "collectionName":"AAA",
            "jobId":"448326802088133753",
            "progress":100,
            "state":"Completed"
         }
      ]
   }
}

GetImportProgress response body example:

{
   "code":200,
   "data":{
      "collectionName":"AAA",
      "jobId":"448326731380817971",
      "progress":90,
      "state":"Importing"
      "details":[
         {
            "completeTime":"2024-03-12 16:06:20.659622301 +0800 CST m=+24.587096137",
            "fileName":"id:448326731380817974 paths:\"milvus_bulkinsert/AAA/rows_2.json\" ",
            "fileSize":44669965,
            "progress":100
         },
         {
            "completeTime":"2024-03-12 16:06:20.659622301 +0800 CST m=+24.587096137",
            "fileName":"id:448326731380817975 paths:\"milvus_bulkinsert/AAA/rows_3.json\" ",
            "fileSize":44669965,
            "progress":100
         },
         {
            "completeTime":"2024-03-12 16:06:20.659622301 +0800 CST m=+24.587096137",
            "fileName":"id:448326731380817973 paths:\"milvus_bulkinsert/AAA/rows_1.json\" ",
            "fileSize":44669965,
            "progress":100
         }
      ],
   }
}

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
Copy link

codecov bot commented Mar 12, 2024

Codecov Report

Attention: Patch coverage is 85.34483% with 17 lines in your changes are missing coverage. Please review.

Project coverage is 81.03%. Comparing base (06b191b) to head (b307047).
Report is 2 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #31192      +/-   ##
==========================================
- Coverage   81.13%   81.03%   -0.10%     
==========================================
  Files         975      965      -10     
  Lines      142206   142525     +319     
==========================================
+ Hits       115373   115500     +127     
- Misses      22987    23166     +179     
- Partials     3846     3859      +13     
Files Coverage Δ
internal/datacoord/import_checker.go 81.52% <100.00%> (+0.06%) ⬆️
internal/datacoord/import_job.go 100.00% <100.00%> (ø)
internal/datacoord/import_scheduler.go 65.02% <100.00%> (+0.14%) ⬆️
internal/datacoord/import_task.go 96.92% <100.00%> (+0.25%) ⬆️
internal/datacoord/import_util.go 86.02% <100.00%> (+1.02%) ⬆️
internal/datacoord/services.go 85.17% <100.00%> (+0.05%) ⬆️
internal/datanode/importv2/task.go 85.18% <100.00%> (+0.18%) ⬆️
...nternal/distributed/proxy/httpserver/request_v2.go 100.00% <100.00%> (ø)
internal/proxy/impl.go 86.22% <100.00%> (+<0.01%) ⬆️
internal/datanode/importv2/executor.go 86.69% <57.14%> (-1.03%) ⬇️
... and 2 more

... and 236 files with indirect coverage changes

@mergify mergify bot added the ci-passed label Mar 12, 2024
@czs007
Copy link
Contributor

czs007 commented Mar 13, 2024

/approve

@mergify mergify bot added ci-passed and removed ci-passed labels Mar 13, 2024
@czs007
Copy link
Contributor

czs007 commented Mar 13, 2024

/approve
/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bigsheeper, czs007

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sre-ci-robot sre-ci-robot merged commit b5c6794 into milvus-io:master Mar 13, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/internal-api ci-passed dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement lgtm size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants