diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-01-21 12:20:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-21 12:20:34 +0100 |
commit | 1f72b7fba34d1b4445291d974cb2670a6cb65d37 (patch) | |
tree | bff1d877fcfbe2a8bedffbcf87d738016b12ef13 /container-search | |
parent | 00d86602a88c66486c8f4c68a1c8bdff096c7273 (diff) | |
parent | 516efec7f4112d109b26deab8d2280df77ed34f8 (diff) |
Merge pull request #25662 from vespa-engine/bratseth/fail-on-no-fill
Don't count unfilled hits towards success
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java | 9 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/result/Hit.java | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java index a9601ee5ec2..936478e705e 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java @@ -41,10 +41,11 @@ public class SearchResponse { } } - static boolean isSuccess(Result r) { - if (r.hits().getErrorHit() == null) return true; - for (Hit hit : r.hits()) { - if (!hit.isMeta()) return true; // contains data : success + static boolean isSuccess(Result result) { + if (result.hits().getErrorHit() == null) return true; + for (Hit hit : result.hits()) { + if (hit.isMeta()) continue; + if ( ! hit.isFillable() || ! hit.getFilled().isEmpty()) return true; } return false; } diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java index 0011d69fc2c..a028bcdd582 100644 --- a/container-search/src/main/java/com/yahoo/search/result/Hit.java +++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java @@ -72,9 +72,8 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi * The summary classes for which this hit is filled. If this set * is 'null', it means that this hit is unfillable, which is * equivalent to a hit where all summary classes have already - * been filled, or a hit where further filling will - * yield no extra information, if you prefer to look at it that - * way. + * been filled, or equivalently a hit where further filling will + * yield no extra information */ private Set<String> filled = null; private Set<String> unmodifiableFilled = null; |