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 search output limit #3693

Merged
merged 1 commit into from Aug 1, 2019
Merged

Conversation

QiWang19
Copy link
Collaborator

@QiWang19 QiWang19 commented Aug 1, 2019

close https://bugzilla.redhat.com/show_bug.cgi?id=1732280
From the bug Podman search returns 25 results even when limit option --limit is larger than 25(maxQueries). They want Podman to return --limit results.

This PR fixes the number of output result.
if --limit not set, return MIN(maxQueries, len(res))
if --limit is set, return MIN(option, len(res))

Signed-off-by: Qi Wang qiwan@redhat.com

search = podmanTest.Podman([]string{"search", "--limit", "30", "docker.io/alpine"})
search.WaitWithDefaultTimeout()
Expect(search.ExitCode()).To(Equal(0))
Expect(len(search.OutputToStringArray())).To(Equal(31))
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a test to verify that without --limit you get 25 lines returned? Or is that in play already?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed. Add another search under --limit section to check the number of lines.

close https://bugzilla.redhat.com/show_bug.cgi?id=1732280
From the bug Podman search returns 25 results even when limit option `--limit` is larger than 25(maxQueries). They want Podman to return `--limit` results.

This PR fixes the number of output result.
if --limit not set, return MIN(maxQueries, len(res))
if --limit is set, return MIN(option, len(res))

Signed-off-by: Qi Wang <qiwan@redhat.com>
@TomSweeneyRedHat
Copy link
Member

LGTM assuming happy tests.
Was thinking there might be a faster way to check maxQueries, options.Limit and len(result), but didn't noodle out one.

@TomSweeneyRedHat
Copy link
Member

Sorry, didn't mean to close, hit the wrong button.

@QiWang19
Copy link
Collaborator Author

QiWang19 commented Aug 1, 2019

LGTM assuming happy tests.
Was thinking there might be a faster way to check maxQueries, options.Limit and len(result), but didn't noodle out one.

if golang has math.Max() or Min() for integer, the code will look simple

@mheon
Copy link
Member

mheon commented Aug 1, 2019

I like it when these things end up being simple fixes.

@mheon
Copy link
Member

mheon commented Aug 1, 2019

LGTM

@mheon
Copy link
Member

mheon commented Aug 1, 2019

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon, QiWang19

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2019
@rhatdan
Copy link
Member

rhatdan commented Aug 1, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2019
@openshift-merge-robot openshift-merge-robot merged commit e48dc50 into containers:master Aug 1, 2019
@QiWang19 QiWang19 deleted the search branch June 26, 2020 15:10
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants