diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
6 files changed, 12 insertions, 24 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java index b6a88200084..b96c0cf42eb 100644 --- a/container-search/src/main/java/com/yahoo/search/Result.java +++ b/container-search/src/main/java/com/yahoo/search/Result.java @@ -311,10 +311,6 @@ public final class Result extends com.yahoo.processing.Response implements Clone public void setCoverage(Coverage coverage) { this.coverage = coverage; } - // Coverage a part of tracing? - // Coverage logic might me moved around, but it should not be a part of tracing. - // Coverage is status information about access to a corpus, tracing is voluntary, - // diagnostic search status. /** * Returns coverage information * diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 56bd3fc57b3..6ebbc3ffdcf 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -253,9 +253,6 @@ public class SearchHandler extends LoggingRequestHandler { Query query = new Query(request, queryProfile); boolean benchmarkCoverage = VespaHeaders.benchmarkCoverage(benchmarkOutput, request.getJDiscRequest().headers()); - if (benchmarkCoverage) { - query.getPresentation().setReportCoverage(true); - } // Find and execute search chain if we have a valid query String invalidReason = query.validate(); diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java index 466ddf88299..cef3d46b947 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java +++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java @@ -64,9 +64,6 @@ public class Presentation implements Cloneable { /** The summary class to be shown */ private String summary = null; - /** Whether coverage information (how much of the indices was searched should be included in the result */ - private boolean reportCoverage=false; - /** The name of the renderer to use for rendering the hits. */ private ComponentSpecification format = RendererRegistry.defaultRendererId.toSpecification(); @@ -99,11 +96,15 @@ public class Presentation implements Cloneable { /** Sets whether matching query terms should be bolded in the result */ public void setBolding(boolean bolding) { this.bolding = bolding; } - /** Returns whether coverage information should be returned in the result, if available. Default is false */ - public boolean getReportCoverage() { return reportCoverage; } + /** @deprecated coverage information is always returned */ + @Deprecated + // TODO: Remove on Vespa 7 + public boolean getReportCoverage() { return true; } - /** Sets whether coverage information should be returned in the result, if available */ - public void setReportCoverage(boolean reportCoverage) { this.reportCoverage=reportCoverage; } + /** @deprecated coverage information is always returned */ + @Deprecated + // TODO: Remove on Vespa 7 + public void setReportCoverage(boolean ignored) { } /** Get the name of the format desired for result rendering. */ @NonNull diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java index cd4e02dc768..7d2ebd2a0ec 100644 --- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java @@ -120,7 +120,7 @@ public class QueryProperties extends Properties { else if (key.size()==2 && key.first().equals(Presentation.PRESENTATION)) { if (key.last().equals(Presentation.BOLDING)) return query.getPresentation().getBolding(); if (key.last().equals(Presentation.SUMMARY)) return query.getPresentation().getSummary(); - if (key.last().equals(Presentation.REPORT_COVERAGE)) return query.getPresentation().getReportCoverage(); + if (key.last().equals(Presentation.REPORT_COVERAGE)) return true; // TODO: Remove this line on Vespa 7 if (key.last().equals(Presentation.FORMAT)) return query.getPresentation().getFormat(); if (key.last().equals(Presentation.TIMING)) return query.getPresentation().getTiming(); if (key.last().equals(Presentation.SUMMARY_FIELDS)) return query.getPresentation().getSummaryFields(); @@ -227,15 +227,13 @@ public class QueryProperties extends Properties { query.getPresentation().setBolding(asBoolean(value, true)); else if (key.last().equals(Presentation.SUMMARY)) query.getPresentation().setSummary(asString(value, "")); - else if (key.last().equals(Presentation.REPORT_COVERAGE)) - query.getPresentation().setReportCoverage(asBoolean(value,true)); else if (key.last().equals(Presentation.FORMAT)) query.getPresentation().setFormat(asString(value,"")); else if (key.last().equals(Presentation.TIMING)) query.getPresentation().setTiming(asBoolean(value, true)); else if (key.last().equals(Presentation.SUMMARY_FIELDS)) query.getPresentation().setSummaryFields(asString(value,"")); - else + else if ( ! key.last().equals(Presentation.REPORT_COVERAGE)) // TODO: Change this line to "else" on Vespa 7 throwIllegalParameter(key.last(), Presentation.PRESENTATION); } else if (key.first().equals("rankfeature") || key.first().equals("featureoverride") ) { // featureoverride is deprecated diff --git a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java index 3cf5d2cb3e5..ad1ad71992b 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java @@ -120,9 +120,7 @@ public final class DefaultRenderer extends AsynchronousSectionedRenderer<Result> utf8Output = "utf-8".equalsIgnoreCase(getRequestedEncoding(result.getQuery())); writer.xmlHeader(getRequestedEncoding(result.getQuery())); writer.openTag(RESULT).attribute(TOTAL_HIT_COUNT, String.valueOf(result.getTotalHitCount())); - if (result.getQuery().getPresentation().getReportCoverage()) { - renderCoverageAttributes(result.getCoverage(false), writer); - } + renderCoverageAttributes(result.getCoverage(false), writer); renderTime(writer, result); writer.closeStartTag(); } diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java index d3039925013..e394a674a06 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java @@ -136,9 +136,7 @@ public final class SyncDefaultRenderer extends Renderer { context.setUtf8Output("utf-8".equalsIgnoreCase(getRequestedEncoding(result.getQuery()))); writer.xmlHeader(getRequestedEncoding(result.getQuery())); writer.openTag(RESULT).attribute(TOTAL_HIT_COUNT,String.valueOf(result.getTotalHitCount())); - if (result.getQuery().getPresentation().getReportCoverage()) { - renderCoverageAttributes(result.getCoverage(false), writer); - } + renderCoverageAttributes(result.getCoverage(false), writer); renderTime(writer, result); writer.closeStartTag(); } |