Tune down number of ignove_above and multi-fields

Author: parkertimmins

test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java

@@ -98,14 +98,14 @@ private Supplier<Map<String, Object>> keywordMapping(boolean hasParent, DataSour
                 }
             }
 
-            if (ESTestCase.randomDouble() <= 0.5) {
-                mapping.put("ignore_above", ESTestCase.randomIntBetween(1, 30));
+            if (ESTestCase.randomDouble() <= 0.2) {
+                mapping.put("ignore_above", ESTestCase.randomIntBetween(1, 50));
             }
             if (ESTestCase.randomDouble() <= 0.2) {
                 mapping.put("null_value", ESTestCase.randomAlphaOfLengthBetween(0, 10));
             }
-            if (hasParent == false && ESTestCase.randomDouble() <= 0.5) {
-                mapping.put("fields", stringSubField(FieldType.KEYWORD, request));
+            if (hasParent == false && ESTestCase.randomDouble() <= 0.3) {
+                mapping.put("fields", stringSubField(request));
             }
 
             return mapping;
@@ -208,8 +208,8 @@ private Supplier<Map<String, Object>> textMapping(boolean hasParent, DataSourceR
             mapping.put("store", ESTestCase.randomBoolean());
             mapping.put("index", ESTestCase.randomBoolean());
 
-            if (hasParent == false && ESTestCase.randomDouble() <= 0.5) {
-                mapping.put("fields", stringSubField(FieldType.TEXT, request));
+            if (hasParent == false && ESTestCase.randomDouble() <= 0.3) {
+                mapping.put("fields", stringSubField(request));
             }
 
             return mapping;
@@ -248,14 +248,14 @@ private Supplier<Map<String, Object>> wildcardMapping(boolean hasParent, DataSou
         return () -> {
             var mapping = new HashMap<String, Object>();
 
-            if (ESTestCase.randomDouble() <= 0.3) {
-                mapping.put("ignore_above", ESTestCase.randomIntBetween(1, 100));
+            if (ESTestCase.randomDouble() <= 0.2) {
+                mapping.put("ignore_above", ESTestCase.randomIntBetween(1, 50));
             }
             if (ESTestCase.randomDouble() <= 0.2) {
                 mapping.put("null_value", ESTestCase.randomAlphaOfLengthBetween(0, 10));
             }
-            if (hasParent == false && ESTestCase.randomDouble() <= 0.5) {
-                mapping.put("fields", stringSubField(FieldType.WILDCARD, request));
+            if (hasParent == false && ESTestCase.randomDouble() <= 0.3) {
+                mapping.put("fields", stringSubField(request));
             }
 
             return mapping;
@@ -268,15 +268,15 @@ private Supplier<Map<String, Object>> matchOnlyTextMapping(
     ) {
         return () -> {
             var mapping = new HashMap<String, Object>();
-            if (hasParent == false && ESTestCase.randomDouble() <= 0.5) {
-                mapping.put("fields", stringSubField(FieldType.MATCH_ONLY_TEXT, request));
+            if (hasParent == false && ESTestCase.randomDouble() <= 0.3) {
+                mapping.put("fields", stringSubField(request));
             }
             return mapping;
         };
     }
 
-    private Map<String, Object> stringSubField(FieldType parent, DataSourceRequest.LeafMappingParametersGenerator request) {
-
+    private Map<String, Object> stringSubField(DataSourceRequest.LeafMappingParametersGenerator request) {
+        FieldType parent = FieldType.tryParse(request.fieldType());
         List<FieldType> stringTypes = List.of(FieldType.TEXT, FieldType.MATCH_ONLY_TEXT, FieldType.KEYWORD, FieldType.WILDCARD);
         var childType = ESTestCase.randomValueOtherThan(parent, () -> ESTestCase.randomFrom(stringTypes));
         var child = switch (childType) {

test/framework/src/main/java/org/elasticsearch/datageneration/queries/QueryGenerator.java

@@ -41,7 +41,7 @@ public List<QueryBuilder> generateQueries(String type, String path, Object value
         return leafQueries.stream().map(q -> wrapInNestedQuery(path, q)).toList();
     }
 
-    public QueryBuilder wrapInNestedQuery(String path, QueryBuilder leafQuery) {
+    private QueryBuilder wrapInNestedQuery(String path, QueryBuilder leafQuery) {
         String[] parts = path.split("\\.");
         List<String> nestedPaths = mappingContextHelper.getNestedPathPrefixes(parts);
         QueryBuilder query = leafQuery;

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/StandardVersusLogsIndexModeChallengeRestIT.java

@@ -71,7 +71,6 @@ protected StandardVersusLogsIndexModeChallengeRestIT(DataGenerationHelper dataGe
     @Override
     public void baselineMappings(XContentBuilder builder) throws IOException {
         dataGenerationHelper.writeStandardMapping(builder);
-        int x = 5;
     }
 
     @Override