CI fix - remove unsafe assertion in wildcard field (#78966) (#78974)

Remove unsafe assertion now that wildcard field does not simplify BooleanQuery logic - can’t rely on it rewriting to a plain MatchAllDocsQuery and is sometimes wrapped in other layers Closes #78949
elastic · Oct 12, 2021 · 3dda4bd · 3dda4bd
1 parent e7d87dc
commit 3dda4bd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/...rc/main/java/org/elasticsearch/xpack/wildcard/mapper/BinaryDvConfirmedAutomatonQuery.java b/...rc/main/java/org/elasticsearch/xpack/wildcard/mapper/BinaryDvConfirmedAutomatonQuery.java
@@ -15,7 +15,6 @@
 import org.apache.lucene.search.ConstantScoreWeight;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Scorer;
@@ -84,8 +83,7 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
                     public boolean matches() throws IOException {
                         if (values.advanceExact(approxDisi.docID()) == false)
                         {
-                            // Bug if we have an indexed value (i.e an approxQuery) but no doc value.
-                            assert approxQuery instanceof MatchAllDocsQuery;
+                            // Can happen when approxQuery resolves to some form of MatchAllDocs expression
                             return false;
                         }
                         BytesRef arrayOfValues = values.binaryValue();

diff --git a/...dcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java b/...dcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java
@@ -311,7 +311,6 @@ private void expectPrefixMatch(IndexSearcher searcher, String term,long count) t
         assertThat(td.totalHits.value, equalTo(count));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/78949")
     public void testSearchResultsVersusKeywordField() throws IOException {
         Directory dir = newDirectory();
         IndexWriterConfig iwc = newIndexWriterConfig(WildcardFieldMapper.WILDCARD_ANALYZER_7_10);