Skip to content

Handle total hits equal to track_total_hits #37907

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

Merged
merged 4 commits into from
Mar 5, 2019
Merged

Handle total hits equal to track_total_hits #37907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdd7078
Handle total hits equal to track_total_hits
jimczi Jan 28, 2019
2ccae88
Merge branch 'master' into bug/track_total_hits_equals
jimczi Mar 4, 2019
5a77a7d
adapt skip version for rest test before backport
jimczi Mar 4, 2019
349fdfd
adapt skip version for rest test before backport
jimczi Mar 4, 2019
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
16 changes: 14 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search/220_total_hits_object.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ setup:
---
"hits.total as an object":
- skip:
version: " - 6.99.99"
version: " - 7.99.99"
reason: hits.total is rendered as an object in 7.0.0

- do:
Expand Down Expand Up @@ -106,7 +106,7 @@ setup:

- do:
search:
size: 3
size: 0
track_total_hits: 4
body:
query:
Expand All @@ -116,6 +116,18 @@ setup:
- match: {hits.total.value: 4}
- match: {hits.total.relation: gte}

- do:
search:
size: 0
track_total_hits: 5
body:
query:
match:
foo: bar

- match: {hits.total.value: 5}
- match: {hits.total.relation: eq}

- do:
catch: /\[rest_total_hits_as_int\] cannot be used if the tracking of total hits is not accurate, got 100/
search:
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ TotalHits getTotalHits() {
assert totalHitsRelation == Relation.EQUAL_TO;
return new TotalHits(totalHits, totalHitsRelation);
} else {
if (totalHits < trackTotalHitsUpTo) {
if (totalHits <= trackTotalHitsUpTo) {
return new TotalHits(totalHits, totalHitsRelation);
} else {
/*
Expand Down