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.

Sign up for GitHub

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

Jump to bottom

fix: iterator cursor progress too fast(#36179) #36180

Merged
merged 1 commit into from
Sep 24, 2024
Merged

fix: iterator cursor progress too fast(#36179) #36180

merged 1 commit into from
Sep 24, 2024

Conversation

MrPresent-Han
Copy link
Contributor

related: #36179

@sre-ci-robot sre-ci-robot added area/internal-api size/L Denotes a PR that changes 100-499 lines. labels Sep 11, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Sep 11, 2024
@MrPresent-Han MrPresent-Han force-pushed the fix-iterator-progress-too-fast branch 2 times, most recently from bf2b456 to cfd8ad6 Compare September 11, 2024 08:58
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 11, 2024

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

@MrPresent-Han
Copy link
Contributor Author

/run-cpu-e2e

@mergify mergify bot added the ci-passed label Sep 11, 2024
@codecov Codecov
Copy link

codecov bot commented Sep 12, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 86.95652% with 6 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@526a672). Learn more about missing BASE report.
Report is 29 commits behind head on master.

Files with missing lines Patch % Lines
internal/util/reduce/reduce_info.go 66.66% 4 Missing ⚠️
internal/proxy/task_query.go 91.30% 1 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #36180   +/-   ##
=========================================
  Coverage          ?   82.48%           
=========================================
  Files             ?     1271           
  Lines             ?   150100           
  Branches          ?        0           
=========================================
  Hits              ?   123804           
  Misses            ?    21347           
  Partials          ?     4949
Files with missing lines Coverage Δ
...rnal/querynodev2/segments/default_limit_reducer.go 100.00% <100.00%> (ø)
internal/querynodev2/segments/result.go 71.11% <100.00%> (ø)
internal/proxy/task_query.go 82.37% <91.30%> (ø)
internal/util/reduce/reduce_info.go 88.46% <66.66%> (ø)

congqixia
congqixia reviewed Sep 12, 2024
View reviewed changes
internal/proxy/task_query.go
@@ -343,7 +364,7 @@ func (t *queryTask) PreExecute(ctx context.Context) error {
if err != nil {
return err
}
t.RetrieveRequest.ReduceStopForBest = queryParams.reduceStopForBest
t.RetrieveRequest.ReduceType = int32(queryParams.reduceType)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we shall fill both field value for backward compatibility concern?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compatibility in the process of rolling upgrade?
this may only result in the number of results not than 'many'

@MrPresent-Han MrPresent-Han force-pushed the fix-iterator-progress-too-fast branch from cfd8ad6 to 37e895b Compare September 14, 2024 10:29
@mergify mergify bot removed the ci-passed label Sep 14, 2024
fix: iterator cursor progress too fast(milvus-io#36179)
e730c92 
Signed-off-by: MrPresent-Han <chun.han@gmail.com>
@MrPresent-Han MrPresent-Han force-pushed the fix-iterator-progress-too-fast branch from 37e895b to e730c92 Compare September 18, 2024 02:34
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 18, 2024

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

@MrPresent-Han
Copy link
Contributor Author

/run-cpu-e2e

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 19, 2024

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

@MrPresent-Han
Copy link
Contributor Author

/run-cpu-e2e

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 19, 2024

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

@MrPresent-Han
Copy link
Contributor Author

/run-cpu-e2e

@mergify mergify bot added the ci-passed label Sep 20, 2024
congqixia
congqixia approved these changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@congqixia congqixia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia, MrPresent-Han

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 df7ae08 into milvus-io:master Sep 24, 2024
16 checks passed
congqixia added a commit to congqixia/milvus that referenced this pull request Sep 24, 2024
@congqixia
enhance: Fix PR conflict in reduce unit test
0129330 
Related to milvus-io#36433 milvus-io#36180

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
@congqixia congqixia mentioned this pull request Sep 24, 2024
Merged
sre-ci-robot pushed a commit that referenced this pull request Sep 24, 2024
@congqixia
enhance: Fix PR conflict in reduce unit test (#36470)
ed95568 
Related to #36433 #36180

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@congqixia congqixia congqixia approved these changes

@bigsheeper bigsheeper Awaiting requested review from bigsheeper

@sunby sunby Awaiting requested review from sunby

Assignees

@congqixia congqixia

Labels
approved area/internal-api ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug lgtm size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MrPresent-Han @sre-ci-robot @congqixia