Exclude unmapped fields during max clause limit checking for querying

server/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java

@@ -87,8 +87,8 @@ public static Map<String, Float> resolveMappingFields(QueryShardContext context,
             boolean allField = Regex.isMatchAllPattern(fieldEntry.getKey());
             boolean multiField = Regex.isSimpleMatchPattern(fieldEntry.getKey());
             float weight = fieldEntry.getValue() == null ? 1.0f : fieldEntry.getValue();
-            Map<String, Float> fieldMap = resolveMappingField(context, fieldEntry.getKey(), weight,
-                !multiField, !allField, fieldSuffix);
+            Map<String, Float> fieldMap = resolveMappingField(context, fieldEntry.getKey(), weight, !multiField, !allField, fieldSuffix);
+
             for (Map.Entry<String, Float> field : fieldMap.entrySet()) {
                 float boost = field.getValue();
                 if (resolvedFields.containsKey(field.getKey())) {
@@ -97,6 +97,7 @@ public static Map<String, Float> resolveMappingFields(QueryShardContext context,
                 resolvedFields.put(field.getKey(), boost);
             }
         }
+
         checkForTooManyFields(resolvedFields, context);
         return resolvedFields;
     }
@@ -141,8 +142,6 @@ public static Map<String, Float> resolveMappingField(QueryShardContext context,
 
             MappedFieldType fieldType = context.getMapperService().fullName(fieldName);
             if (fieldType == null) {
-                // Note that we don't ignore unmapped fields.
-                fields.put(fieldName, weight);
                 continue;
             }
 

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

@@ -50,6 +50,7 @@
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.Operations;
 import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -399,6 +400,14 @@ protected void doAssertLuceneQuery(QueryStringQueryBuilder queryBuilder,
         // nothing yet, put additional assertions here.
     }
 
+    @Override
+    protected Settings createTestIndexSettings() {
+        return Settings.builder()
+            .put(super.createTestIndexSettings())
+            .put("indices.query.bool.max_clause_count", "13")
+            .build();
+    }
+
     // Tests fix for https://github.com/elastic/elasticsearch/issues/29403
     public void testTimezoneEquals() {
         QueryStringQueryBuilder builder1 = new QueryStringQueryBuilder("bar");
@@ -1290,6 +1299,61 @@ public void testQuoteAnalyzer() throws Exception {
         assertEquals(expectedQuery, query);
     }
 
+    // The only expectation for this test is to not throw exception
+    public void testToQueryExceedingMaxClauseCountWithUnmappedFields() throws Exception {
+        QueryShardContext shardContext = createShardContext();
+
+        new QueryStringQueryBuilder("\"bar\"")
+                .field("*")
+                .field("unmappedField1")
+                .field("unmappedField2")
+                .field("unmappedField3")
+                .field("unmappedField4")
+                .toQuery(shardContext);
+    }
+
+    public void testToQueryMaxClauseWithWeight() throws IOException {
+        QueryShardContext shardContext = createShardContext();
+        shardContext.getMapperService()
+            .merge("_doc", new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef("_doc",
+                "additionalMappedField1", "type=text",
+                "additionalMappedField2", "type=text",
+                "additionalMappedField3", "type=text",
+                "additionalMappedField4", "type=text"
+            ))), MapperService.MergeReason.MAPPING_UPDATE);
+
+        try {
+            new QueryStringQueryBuilder("\"bar\"")
+                .field("*")
+                .toQuery(shardContext);
+            fail();
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("field expansion matches too many fields, limit: 13, got: 17", e.getMessage());
+        }
+
+    }
+
+    public void testToQueryMaxClauseNoWeight() throws IOException {
+        QueryShardContext shardContext = createShardContext();
+        shardContext.getMapperService()
+            .merge("_doc", new CompressedXContent(Strings.toString(PutMappingRequest.buildFromSimplifiedDef("_doc",
+                "additionalMappedField1", "type=text",
+                "additionalMappedField2", "type=text",
+                "additionalMappedField3", "type=text",
+                "additionalMappedField4", "type=text"
+            ))), MapperService.MergeReason.MAPPING_UPDATE);
+
+        try {
+            new QueryStringQueryBuilder("\"bar\"")
+                .toQuery(shardContext);
+            fail();
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("field expansion matches too many fields, limit: 13, got: 17", e.getMessage());
+        }
+    }
+
     public void testQuoteFieldSuffix() throws IOException {
         QueryShardContext context = createShardContext();
         assertEquals(new TermQuery(new Term(STRING_FIELD_NAME, "bar")),

server/src/test/resources/config/elasticsearch.yml

@@ -1,3 +1,2 @@
 
 yaml.config.exists: true
-

test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java

@@ -212,21 +212,17 @@ public static void afterClass() throws Exception {
 
     @Before
     public void beforeTest() throws Exception {
-        if (serviceHolder == null) {
-            assert serviceHolderWithNoType == null;
-            // we initialize the serviceHolder and serviceHolderWithNoType just once, but need some
-            // calls to the randomness source during its setup. In order to not mix these calls with
-            // the randomness source that is later used in the test method, we use the master seed during
-            // this setup
-            long masterSeed = SeedUtils.parseSeed(RandomizedTest.getContext().getRunnerSeedAsString());
-            RandomizedTest.getContext().runWithPrivateRandomness(masterSeed, (Callable<Void>) () -> {
-                serviceHolder = new ServiceHolder(nodeSettings, createTestIndexSettings(), getPlugins(), nowInMillis,
-                        AbstractBuilderTestCase.this, true);
-                serviceHolderWithNoType = new ServiceHolder(nodeSettings, createTestIndexSettings(), getPlugins(), nowInMillis,
-                        AbstractBuilderTestCase.this, false);
-                return null;
-            });
-        }
+        // we re-initiate serviceHolder for every test as some test cases may alter the state of serviceHolder
+        // and its inner objects, and reusing the same one may cause failure of other test cases.
+        // E.g. some test cases may alter field mapping information in serviceHolder.mapperService
+        long masterSeed = SeedUtils.parseSeed(RandomizedTest.getContext().getRunnerSeedAsString());
+        RandomizedTest.getContext().runWithPrivateRandomness(masterSeed, (Callable<Void>) () -> {
+            serviceHolder = new ServiceHolder(nodeSettings, createTestIndexSettings(), getPlugins(), nowInMillis,
+                    AbstractBuilderTestCase.this, true);
+            serviceHolderWithNoType = new ServiceHolder(nodeSettings, createTestIndexSettings(), getPlugins(), nowInMillis,
+                    AbstractBuilderTestCase.this, false);
+            return null;
+        });
 
         serviceHolder.clientInvocationHandler.delegate = this;
         serviceHolderWithNoType.clientInvocationHandler.delegate = this;
@@ -400,11 +396,11 @@ public void onRemoval(ShardId shardId, Accountable accountable) {
                 testCase.initializeAdditionalMappings(mapperService);
             }
         }
-                
+
         public static Predicate<String> indexNameMatcher() {
             // Simplistic index name matcher used for testing
             return pattern -> Regex.simpleMatch(pattern, index.getName());
-        }                 
+        }
 
         @Override
         public void close() throws IOException {