diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java | 5 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java | 19 |
2 files changed, 4 insertions, 20 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index edd11974f8c..34ddd8e16cc 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -6,7 +6,6 @@ import com.yahoo.prelude.Pong; import com.yahoo.prelude.querytransform.QueryRewrite; import com.yahoo.search.Query; import com.yahoo.search.Result; -import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.search.dispatch.Dispatcher; import com.yahoo.search.dispatch.FillInvoker; import com.yahoo.search.dispatch.SearchInvoker; @@ -21,7 +20,6 @@ import com.yahoo.search.searchchain.Execution; import java.io.IOException; import java.util.Optional; -import java.util.logging.Level; /** * The searcher which forwards queries to fdispatch nodes, using the fnet/fs4 @@ -170,7 +168,4 @@ public class FastSearcher extends VespaBackEndSearcher { return "fast searcher (" + getName() + ") "; } - protected boolean isLoggingFine() { - return getLogger().isLoggable(Level.FINE); - } } diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java index e184037bc90..f948ddfb8e9 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java @@ -28,7 +28,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.logging.Level; import java.util.logging.Logger; /** @@ -83,8 +82,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { if (tree instanceof GeoLocationItem) { return true; } - if (tree instanceof CompositeItem) { - var composite = (CompositeItem)tree; + if (tree instanceof CompositeItem composite) { for (Item child : composite.items()) { if (hasLocation(child)) return true; } @@ -202,8 +200,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { for (Iterator<Hit> i = hitIterator(result); i.hasNext(); ) { Hit hit = i.next(); - if (hit instanceof FastHit) { - FastHit fastHit = (FastHit) hit; + if (hit instanceof FastHit fastHit) { if ( ! fastHit.isFilled(summaryClass)) { Query q = fastHit.getQuery(); if (q == null) { @@ -309,9 +306,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { s.append(" restrict=").append(query.getModel().getRestrict().toString()); } - if (quotedSummaryClass.isPresent()) { - s.append(" summary=").append(quotedSummaryClass.get()); - } + quotedSummaryClass.ifPresent((String summaryClass) -> s.append(" summary=").append(summaryClass)); query.trace(s.toString(), false, level); if (query.getTrace().isTraceable(level + 1)) { @@ -367,9 +362,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { for (Iterator<Hit> i = hitIterator(result); i.hasNext();) { Hit hit = i.next(); - if (hit instanceof FastHit && ! hit.isFilled(summaryClass)) { - FastHit fastHit = (FastHit) hit; - + if (hit instanceof FastHit fastHit && ! hit.isFilled(summaryClass)) { DocsumPacket docsum = packets[packetIndex]; packetIndex++; @@ -407,10 +400,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { return error; } - protected boolean isLoggingFine() { - return getLogger().isLoggable(Level.FINE); - } - public void shutDown() { } } |