summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥vard Pettersen <havardpe@gmail.com>2017-08-17 15:32:39 +0200
committerGitHub <noreply@github.com>2017-08-17 15:32:39 +0200
commitedef949b55e6a5dc36672baf23da048b591ec279 (patch)
treeb4ca738e819df2b1f6b7e7f8623f06d8798ba469
parent3985c66b1b52117fb56bb0b3dbd4fe3d85bf91e5 (diff)
parentd7bacbd4f2b6907e0375e8d4f08ec3ec4d9ddb8a (diff)
Merge pull request #3140 from vespa-engine/balder/fix-summar-y-typo
wantsRPCSummarFill -> wantsRPCSummaryFill
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java4
2 files changed, 3 insertions, 3 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 bbc5af64c62..50d6a524320 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
@@ -262,7 +262,7 @@ public class FastSearcher extends VespaBackEndSearcher {
Query query = result.getQuery();
traceQuery(getName(), "fill", query, query.getOffset(), query.getHits(), 2, quotedSummaryClass(summaryClass));
- if (wantsRPCSummarFill(query)) {
+ if (wantsRPCSummaryFill(query)) {
CompressionType compression =
CompressionType.valueOf(query.properties().getString(dispatchCompression, "LZ4").toUpperCase());
fillSDDocName(result);
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 ae6d029fde8..3369eb64094 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
@@ -112,7 +112,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
protected abstract void doPartialFill(Result result, String summaryClass);
- protected static boolean wantsRPCSummarFill(Query query) {
+ protected static boolean wantsRPCSummaryFill(Query query) {
return query.properties().getBoolean(dispatchSummaries);
}
@@ -218,7 +218,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
return new Result(query, ErrorMessage.createNullQuery(query.getHttpRequest().getUri().toString()));
}
- if (wantsRPCSummarFill(query) && summaryNeedsQuery(query)) {
+ if (wantsRPCSummaryFill(query) && summaryNeedsQuery(query)) {
return new Result(query, ErrorMessage.createInvalidQueryParameter(
"When using dispatch.summaries and your summary/rankprofile require the query, " +
" you need to enable ranking.queryCache."));