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

fix merge result #2463

Merged
merged 3 commits into from
Jun 1, 2020
Merged

fix merge result #2463

merged 3 commits into from
Jun 1, 2020

Conversation

shengjun1985
Copy link
Contributor

@shengjun1985 shengjun1985 commented May 29, 2020

Signed-off-by: shengjun.li shengjun.li@zilliz.com

What type of PR is this?
bug

What this PR does / why we need it:
(1) If the collection is empty, the server will returns NQ "-1"s.
(2) Modify the CI tests.

Which issue(s) this PR fixes:
Fixes #2479

Special notes for your reviewer:
no

Additional documentation (e.g. design docs, usage docs, etc.):
no

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
@shengjun1985 shengjun1985 requested a review from JinHai-CN as a code owner June 1, 2020 02:22
Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
@codecov
Copy link

codecov bot commented Jun 1, 2020

Codecov Report

Merging #2463 into 0.10.0 will decrease coverage by 0.50%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           0.10.0    #2463      +/-   ##
==========================================
- Coverage   89.74%   89.24%   -0.51%     
==========================================
  Files         425      425              
  Lines       26325    26265      -60     
==========================================
- Hits        23625    23439     -186     
- Misses       2700     2826     +126     
Impacted Files Coverage Δ
core/src/scheduler/task/SearchTask.cpp 95.65% <ø> (-0.11%) ⬇️
core/src/scheduler/JobMgr.cpp 75.00% <100.00%> (-1.20%) ⬇️
core/unittest/db/test_delete.cpp 100.00% <100.00%> (ø)
...src/server/delivery/request/SearchCombineRequest.h 0.00% <0.00%> (-100.00%) ⬇️
core/src/server/delivery/request/SearchRequest.h 16.66% <0.00%> (-83.34%) ⬇️
...c/server/delivery/request/SearchCombineRequest.cpp 0.00% <0.00%> (-69.68%) ⬇️
...src/server/delivery/strategy/SearchReqStrategy.cpp 4.76% <0.00%> (-66.67%) ⬇️
core/src/server/delivery/RequestQueue.cpp 88.88% <0.00%> (-5.56%) ⬇️
.../src/server/delivery/request/SearchByIDRequest.cpp 71.05% <0.00%> (-1.45%) ⬇️
core/src/server/delivery/request/SearchRequest.cpp 67.69% <0.00%> (-0.97%) ⬇️
... and 22 more

@shengjun1985 shengjun1985 removed the request for review from JinHai-CN June 1, 2020 07:20
@mergify mergify bot merged commit 257ea77 into milvus-io:0.10.0 Jun 1, 2020
@shengjun1985 shengjun1985 deleted the merge_result branch June 1, 2020 09:04
JinHai-CN pushed a commit that referenced this pull request Jun 12, 2020
* fix merge result

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>

* fix tests

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants