summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2019-06-11 23:06:49 +0200
committerGitHub <noreply@github.com>2019-06-11 23:06:49 +0200
commitb7a9054331578197aada6826f734a24735604046 (patch)
tree6b1e547b0764bdcea9b62a478e8f1fa787627dc7
parent9111729ff3bb3de588a9d4b4c5af313155855d18 (diff)
parentd530e9af0a079ac5751baf0778d4896877dba07b (diff)
Merge pull request #9750 from vespa-engine/ollivir/eager-hit-trimming
Trim hits more eagerly
-rw-r--r--container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index 457e587da40..bf0abb1132f 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -124,7 +124,7 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
}
private void trimResult(Execution execution) {
- if (trimResult) {
+ if (trimResult || result.hits().size() > query.getHits()) {
result.hits().trim(query.getOffset(), query.getHits());
}
}