diff options
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/CacheControl.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/CacheControl.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/CacheControl.java index c1c818848ad..b7e16b6c082 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/CacheControl.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/CacheControl.java @@ -12,7 +12,7 @@ import com.yahoo.processing.request.CompoundName; /** * The cache control logic for FastSearcher * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class CacheControl { 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 527b5230018..e5f255f18c0 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 @@ -261,6 +261,7 @@ public class FastSearcher extends VespaBackEndSearcher { if (query.properties().getBoolean(dispatchSummaries, true) && ! summaryNeedsQuery(query) + && ! cacheControl.useCache(query) && ! legacyEmulationConfigIsSet(getDocumentDatabase(query))) { CompressionType compression = |