From 516efec7f4112d109b26deab8d2280df77ed34f8 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 20 Jan 2023 17:46:37 +0100 Subject: Don't count unfilled hits towards success --- .../src/main/java/com/yahoo/search/handler/SearchResponse.java | 9 +++++---- container-search/src/main/java/com/yahoo/search/result/Hit.java | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'container-search') 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 filled = null; private Set unmodifiableFilled = null; -- cgit v1.2.3