From 28e91e59962b9e8320e6eba2ea29f6754ccb9422 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Fri, 11 Feb 2022 14:40:21 -0500
Subject: [PATCH 1/2] Shrink slow log for has_child query

This removes the defaults from the `toXContent` of the `has_child` query
so slow logs that contain it are marginally easier to read.

Relates to #76515
---
 .../join/query/HasChildQueryBuilder.java      | 23 ++++--
 .../join/query/HasChildQueryBuilderTests.java | 79 ++++++++++++++++++-
 2 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
index 306931fbf8b78..0ec4c0c79c3e0 100644
--- a/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
+++ b/modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
@@ -60,6 +60,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
      * The default minimum number of children that are required to match for the parent to be considered a match.
      */
     public static final int DEFAULT_MIN_CHILDREN = 1;
+    private static final ScoreMode DEFAULT_SCORE_MODE = ScoreMode.None;
 
     /**
      * The default value for ignore_unmapped.
@@ -80,7 +81,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
     private InnerHitBuilder innerHitBuilder;
     private int minChildren = DEFAULT_MIN_CHILDREN;
     private int maxChildren = DEFAULT_MAX_CHILDREN;
-    private boolean ignoreUnmapped = false;
+    private boolean ignoreUnmapped = DEFAULT_IGNORE_UNMAPPED;
 
     public HasChildQueryBuilder(String type, QueryBuilder query, ScoreMode scoreMode) {
         this(type, query, DEFAULT_MIN_CHILDREN, DEFAULT_MAX_CHILDREN, scoreMode, null);
@@ -224,11 +225,19 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         builder.field(QUERY_FIELD.getPreferredName());
         query.toXContent(builder, params);
         builder.field(TYPE_FIELD.getPreferredName(), type);
-        builder.field(SCORE_MODE_FIELD.getPreferredName(), NestedQueryBuilder.scoreModeAsString(scoreMode));
-        builder.field(MIN_CHILDREN_FIELD.getPreferredName(), minChildren);
-        builder.field(MAX_CHILDREN_FIELD.getPreferredName(), maxChildren);
-        builder.field(IGNORE_UNMAPPED_FIELD.getPreferredName(), ignoreUnmapped);
-        printBoostAndQueryName(builder);
+        if (false == scoreMode.equals(DEFAULT_SCORE_MODE)) {
+            builder.field(SCORE_MODE_FIELD.getPreferredName(), NestedQueryBuilder.scoreModeAsString(scoreMode));
+        }
+        if (minChildren != DEFAULT_MIN_CHILDREN) {
+            builder.field(MIN_CHILDREN_FIELD.getPreferredName(), minChildren);
+        }
+        if (maxChildren != DEFAULT_MAX_CHILDREN) {
+            builder.field(MAX_CHILDREN_FIELD.getPreferredName(), maxChildren);
+        }
+        if (ignoreUnmapped != DEFAULT_IGNORE_UNMAPPED) {
+            builder.field(IGNORE_UNMAPPED_FIELD.getPreferredName(), ignoreUnmapped);
+        }
+        boostAndQueryNameToXContent(builder);
         if (innerHitBuilder != null) {
             builder.field(INNER_HITS_FIELD.getPreferredName(), innerHitBuilder, params);
         }
@@ -238,7 +247,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     public static HasChildQueryBuilder fromXContent(XContentParser parser) throws IOException {
         float boost = AbstractQueryBuilder.DEFAULT_BOOST;
         String childType = null;
-        ScoreMode scoreMode = ScoreMode.None;
+        ScoreMode scoreMode = DEFAULT_SCORE_MODE;
         int minChildren = HasChildQueryBuilder.DEFAULT_MIN_CHILDREN;
         int maxChildren = HasChildQueryBuilder.DEFAULT_MAX_CHILDREN;
         boolean ignoreUnmapped = DEFAULT_IGNORE_UNMAPPED;
diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
index 349a3ce5ebba4..a362e85c5b599 100644
--- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
+++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
@@ -40,6 +40,7 @@
 import org.elasticsearch.index.query.WrapperQueryBuilder;
 import org.elasticsearch.index.similarity.SimilarityService;
 import org.elasticsearch.join.ParentJoinPlugin;
+import org.elasticsearch.join.query.HasChildQueryBuilder.LateParsingQuery;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
@@ -55,7 +56,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.elasticsearch.join.query.HasChildQueryBuilder.LateParsingQuery;
 import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -245,7 +245,14 @@ public void testFromJson() throws IOException {
               }
             }""";
         HasChildQueryBuilder queryBuilder = (HasChildQueryBuilder) parseQuery(query);
-        checkGeneratedJson(query, queryBuilder);
+        checkGeneratedJson(
+            /*
+             * Ignoring unampped is the default and we don't dump it and can't
+             * change it if we're going to use inner_hits.
+             */
+            query.replaceFirst("\"ignore_unmapped\" : false,", ""),
+            queryBuilder
+        );
         assertEquals(query, queryBuilder.maxChildren(), 1217235442);
         assertEquals(query, queryBuilder.minChildren(), 883170873);
         assertEquals(query, queryBuilder.boost(), 2.0f, 0.0f);
@@ -259,6 +266,74 @@ public void testFromJson() throws IOException {
         assertEquals(query, queryBuilder.innerHit(), expected);
     }
 
+    public void testParseDefaultsRemoved() throws IOException {
+        String query = """
+            {
+              "has_child" : {
+                "query" : {
+                  "range" : {
+                    "mapped_string" : {
+                      "gte" : "agJhRET",
+                      "lte" : "zvqIq",
+                      "boost" : 1.0
+                    }
+                  }
+                },
+                "type" : "child",
+                "score_mode" : "none",
+                "min_children" : 1,
+                "max_children" : MAX_CHILDREN,
+                "ignore_unmapped" : false,
+                "boost" : 1.0,
+                "inner_hits" : {
+                  "name" : "inner_hits_name",
+                  "ignore_unmapped" : false,
+                  "from" : 0,
+                  "size" : 100,
+                  "version" : false,
+                  "seq_no_primary_term" : false,
+                  "explain" : false,
+                  "track_scores" : false,
+                  "sort" : [ {
+                    "mapped_string" : {
+                      "order" : "asc"
+                    }
+                  } ]
+                }
+              }
+            }""".replaceAll("MAX_CHILDREN", Integer.toString(Integer.MAX_VALUE));
+        checkGeneratedJson("""
+            {
+              "has_child" : {
+                "query" : {
+                  "range" : {
+                    "mapped_string" : {
+                      "gte" : "agJhRET",
+                      "lte" : "zvqIq",
+                      "boost" : 1.0
+                    }
+                  }
+                },
+                "type" : "child",
+                "inner_hits" : {
+                  "name" : "inner_hits_name",
+                  "ignore_unmapped" : false,
+                  "from" : 0,
+                  "size" : 100,
+                  "version" : false,
+                  "seq_no_primary_term" : false,
+                  "explain" : false,
+                  "track_scores" : false,
+                  "sort" : [ {
+                    "mapped_string" : {
+                      "order" : "asc"
+                    }
+                  } ]
+                }
+              }
+            }""", parseQuery(query));
+    }
+
     public void testToQueryInnerQueryType() throws IOException {
         SearchExecutionContext searchExecutionContext = createSearchExecutionContext();
         HasChildQueryBuilder hasChildQueryBuilder = hasChildQuery(CHILD_DOC, new IdsQueryBuilder().addIds("id"), ScoreMode.None);

From 1d5df5bd6ac0ce586a9efda2aca19664df60df6d Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Mon, 14 Feb 2022 13:30:45 -0500
Subject: [PATCH 2/2] Speeling

---
 .../org/elasticsearch/join/query/HasChildQueryBuilderTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
index a362e85c5b599..a36d522cea9da 100644
--- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
+++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
@@ -247,7 +247,7 @@ public void testFromJson() throws IOException {
         HasChildQueryBuilder queryBuilder = (HasChildQueryBuilder) parseQuery(query);
         checkGeneratedJson(
             /*
-             * Ignoring unampped is the default and we don't dump it and can't
+             * Ignoring unmapped is the default and we don't dump it and can't
              * change it if we're going to use inner_hits.
              */
             query.replaceFirst("\"ignore_unmapped\" : false,", ""),