From e1a381afeeeed8d8b89d9260079892d935af881d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Thu, 16 Apr 2020 21:07:40 +0200 Subject: [PATCH] Fix test failure in FunctionScoreQueryBuilderTests.testCacheability We rewrite more query builders to MatchNoneQueryBuilders now, which are always cacheable. We should make sure the tests expects this when the rewritten query is a MatchNoneQueryBuilder. Closes #55331 --- .../query/functionscore/FunctionScoreQueryBuilderTests.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index 19a28fb49c9ce..068a4536757c4 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -20,6 +20,7 @@ package org.elasticsearch.index.query.functionscore; import com.fasterxml.jackson.core.JsonParseException; + import org.apache.lucene.index.Term; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery; @@ -829,6 +830,10 @@ public void testCacheability() throws IOException { QueryShardContext context = createShardContext(); QueryBuilder rewriteQuery = rewriteQuery(queryBuilder, new QueryShardContext(context)); assertNotNull(rewriteQuery.toQuery(context)); + // we occasionally need to update the expected "isCacheable" flag after rewrite for MatchNoneQueryBuilder + if (rewriteQuery instanceof MatchNoneQueryBuilder) { + isCacheable = true; + } assertEquals("query should " + (isCacheable ? "" : "not") + " be cacheable: " + queryBuilder.toString(), isCacheable, context.isCacheable());