iter

Author: javanna

modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java

@@ -422,7 +422,9 @@ public void parse(DocumentParserContext context) throws IOException {
         IndexVersion indexVersion = context.indexSettings().getIndexVersionCreated();
         createQueryBuilderField(indexVersion, clusterTransportVersion.get(), queryBuilderField, queryBuilder, context);
 
-        QueryBuilder queryBuilderForProcessing = queryBuilder.rewrite(new SearchExecutionContext(executionContext));
+        SearchExecutionContext copy = new SearchExecutionContext(executionContext);
+        configureContext(copy, isMapUnmappedFieldAsText());
+        QueryBuilder queryBuilderForProcessing = queryBuilder.rewrite(copy);
         Query query = queryBuilderForProcessing.toQuery(executionContext);
         processQuery(query, context);
     }

server/src/main/java/org/elasticsearch/lucene/queries/SpanMatchNoDocsQuery.java

@@ -25,6 +25,7 @@
 /**
  * A {@link SpanQuery} that matches no documents.
  */
+//TODO is this still needed?
 public class SpanMatchNoDocsQuery extends SpanQuery {
     private final String field;
     private final String reason;

server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java

@@ -9,10 +9,12 @@
 
 package org.elasticsearch.index.query;
 
+import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.RegexpQuery;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.core.Strings;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.test.AbstractQueryTestCase;
 
 import java.io.IOException;
@@ -72,11 +74,15 @@ private static RegexpQueryBuilder randomRegexpQuery() {
 
     @Override
     protected void doAssertLuceneQuery(RegexpQueryBuilder queryBuilder, Query query, SearchExecutionContext context) throws IOException {
-        assertThat(query, instanceOf(RegexpQuery.class));
-        RegexpQuery regexpQuery = (RegexpQuery) query;
-
-        String expectedFieldName = expectedFieldName(queryBuilder.fieldName());
-        assertThat(regexpQuery.getField(), equalTo(expectedFieldName));
+        MappedFieldType fieldType = context.getFieldType(queryBuilder.fieldName());
+        if (fieldType == null) {
+            assertThat(query, instanceOf(MatchNoDocsQuery.class));
+        } else {
+            assertThat(query, instanceOf(RegexpQuery.class));
+            RegexpQuery regexpQuery = (RegexpQuery) query;
+            String expectedFieldName = expectedFieldName(queryBuilder.fieldName());
+            assertThat(regexpQuery.getField(), equalTo(expectedFieldName));
+        }
     }
 
     public void testIllegalArguments() {

server/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java

@@ -12,6 +12,7 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queries.spans.SpanTermQuery;
 import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.elasticsearch.common.ParsingException;
@@ -58,7 +59,7 @@ protected void doAssertLuceneQuery(SpanTermQueryBuilder queryBuilder, Query quer
             Term term = ((TermQuery) mapper.termQuery(queryBuilder.value(), null)).getTerm();
             assertThat(spanTermQuery.getTerm(), equalTo(term));
         } else {
-            assertThat(query, instanceOf(SpanMatchNoDocsQuery.class));
+            assertThat(query, instanceOf(MatchNoDocsQuery.class));
         }
     }