Shrink slow log for rank_feature query (#83847)

This removes the `boost` from the `toXContent` of `rank_feature` if it is the default. It also removes the score function if it is the default. Relates to #76515
elastic · Feb 11, 2022 · 4fddf98 · 4fddf98
1 parent 6f8db84
commit 4fddf98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/...r-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilder.java b/...r-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilder.java
@@ -32,6 +32,7 @@
  * Query to run on a [rank_feature] field.
  */
 public final class RankFeatureQueryBuilder extends AbstractQueryBuilder<RankFeatureQueryBuilder> {
+    private static final ScoreFunction DEFAULT_SCORE_FUNCTION = new ScoreFunction.Saturation();
 
     /**
      * Scoring function for a [rank_feature] field.
@@ -309,7 +310,7 @@ private static ScoreFunction readScoreFunction(StreamInput in) throws IOExceptio
         if (numNonNulls > 1) {
             throw new IllegalArgumentException("Can only specify one of [log], [saturation], [sigmoid] and [linear]");
         } else if (numNonNulls == 0) {
-            query = new RankFeatureQueryBuilder(field, new ScoreFunction.Saturation());
+            query = new RankFeatureQueryBuilder(field, DEFAULT_SCORE_FUNCTION);
         } else {
             ScoreFunction scoreFunction = (ScoreFunction) Arrays.stream(args, 3, args.length).filter(Objects::nonNull).findAny().get();
             query = new RankFeatureQueryBuilder(field, scoreFunction);
@@ -368,8 +369,10 @@ protected void doWriteTo(StreamOutput out) throws IOException {
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(getName());
         builder.field("field", field);
-        scoreFunction.doXContent(builder);
-        printBoostAndQueryName(builder);
+        if (false == scoreFunction.equals(DEFAULT_SCORE_FUNCTION)) {
+            scoreFunction.doXContent(builder);
+        }
+        boostAndQueryNameToXContent(builder);
         builder.endObject();
     }
 

diff --git a/...ras/src/test/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilderTests.java b/...ras/src/test/java/org/elasticsearch/index/mapper/extras/RankFeatureQueryBuilderTests.java
@@ -147,4 +147,21 @@ public void testIllegalCombination() {
             e.getMessage()
         );
     }
+
+    public void testParseDefaultsRemoved() throws IOException {
+        String json = """
+            {
+              "rank_feature" : {
+                "field": "foo",
+                "boost": 1,
+                "saturation": {}
+              }
+            }""";
+        checkGeneratedJson("""
+            {
+              "rank_feature": {
+                "field": "foo"
+              }
+            }""", parseQuery(json));
+    }
 }