leniency is only part of the text similarity builders

Author: thecoop

server/src/internalClusterTest/java/org/elasticsearch/search/rank/FieldBasedRerankerIT.java

@@ -100,7 +100,7 @@ public static FieldBasedRankBuilder fromXContent(XContentParser parser) throws I
         }
 
         public FieldBasedRankBuilder(final int rankWindowSize, final String field) {
-            super(rankWindowSize, false);
+            super(rankWindowSize);
             this.field = field;
         }
 
@@ -205,7 +205,7 @@ public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId)
 
         @Override
         public RankFeaturePhaseRankCoordinatorContext buildRankFeaturePhaseCoordinatorContext(int size, int from, Client client) {
-            return new RankFeaturePhaseRankCoordinatorContext(size, from, rankWindowSize(), isLenient()) {
+            return new RankFeaturePhaseRankCoordinatorContext(size, from, rankWindowSize(), false) {
                 @Override
                 protected void computeScores(RankFeatureDoc[] featureDocs, ActionListener<float[]> scoreListener) {
                     float[] scores = new float[featureDocs.length];
@@ -346,7 +346,7 @@ public RankShardResult buildRankFeatureShardResult(SearchHits hits, int shardId)
         @Override
         public RankFeaturePhaseRankCoordinatorContext buildRankFeaturePhaseCoordinatorContext(int size, int from, Client client) {
             if (this.throwingRankBuilderType == ThrowingRankBuilderType.THROWING_RANK_FEATURE_PHASE_COORDINATOR_CONTEXT)
-                return new RankFeaturePhaseRankCoordinatorContext(size, from, rankWindowSize(), isLenient()) {
+                return new RankFeaturePhaseRankCoordinatorContext(size, from, rankWindowSize(), false) {
                     @Override
                     protected void computeScores(RankFeatureDoc[] featureDocs, ActionListener<float[]> scoreListener) {
                         throw new UnsupportedOperationException("rfc - simulated failure");

server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java

@@ -337,7 +337,7 @@ public MockRequestActionBasedRankBuilder(
             final String inferenceText,
             final float minScore
         ) {
-            super(rankWindowSize, false);
+            super(rankWindowSize);
             this.field = field;
             this.inferenceId = inferenceId;
             this.inferenceText = inferenceText;

server/src/main/java/org/elasticsearch/search/rank/RankBuilder.java

@@ -11,7 +11,6 @@
 
 import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Query;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -43,32 +42,21 @@
 public abstract class RankBuilder implements VersionedNamedWriteable, ToXContentObject {
 
     public static final ParseField RANK_WINDOW_SIZE_FIELD = new ParseField("rank_window_size");
-    public static final ParseField LENIENT_FIELD = new ParseField("lenient");
 
     public static final int DEFAULT_RANK_WINDOW_SIZE = SearchService.DEFAULT_SIZE;
 
     private final int rankWindowSize;
-    private final boolean lenient;
 
-    public RankBuilder(int rankWindowSize, boolean lenient) {
+    public RankBuilder(int rankWindowSize) {
         this.rankWindowSize = rankWindowSize;
-        this.lenient = lenient;
     }
 
     public RankBuilder(StreamInput in) throws IOException {
         rankWindowSize = in.readVInt();
-        if (in.getTransportVersion().onOrAfter(TransportVersions.LENIENT_RERANKERS)) {
-            lenient = in.readBoolean();
-        } else {
-            lenient = false;
-        }
     }
 
     public final void writeTo(StreamOutput out) throws IOException {
         out.writeVInt(rankWindowSize);
-        if (out.getTransportVersion().onOrAfter(TransportVersions.LENIENT_RERANKERS)) {
-            out.writeBoolean(lenient);
-        }
         doWriteTo(out);
     }
 
@@ -79,9 +67,6 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params)
         builder.startObject();
         builder.startObject(getWriteableName());
         builder.field(RANK_WINDOW_SIZE_FIELD.getPreferredName(), rankWindowSize);
-        if (lenient) {
-            builder.field(LENIENT_FIELD.getPreferredName(), lenient);
-        }
         doXContent(builder, params);
         builder.endObject();
         builder.endObject();
@@ -94,10 +79,6 @@ public int rankWindowSize() {
         return rankWindowSize;
     }
 
-    public boolean isLenient() {
-        return lenient;
-    }
-
     /**
      * Specify whether this rank builder is a compound builder or not. A compound builder is a rank builder that requires
      * two or more queries to be executed in order to generate the final result.
@@ -153,14 +134,14 @@ public final boolean equals(Object obj) {
             return false;
         }
         RankBuilder other = (RankBuilder) obj;
-        return rankWindowSize == other.rankWindowSize && lenient == other.lenient && doEquals(other);
+        return rankWindowSize == other.rankWindowSize && doEquals(other);
     }
 
     protected abstract boolean doEquals(RankBuilder other);
 
     @Override
     public final int hashCode() {
-        return Objects.hash(getClass(), rankWindowSize, lenient, doHashCode());
+        return Objects.hash(getClass(), rankWindowSize, doHashCode());
     }
 
     protected abstract int doHashCode();

server/src/test/java/org/elasticsearch/action/search/RankFeaturePhaseTests.java

@@ -867,7 +867,7 @@ private RankBuilder rankBuilder(
         RankFeaturePhaseRankShardContext rankFeaturePhaseRankShardContext,
         RankFeaturePhaseRankCoordinatorContext rankFeaturePhaseRankCoordinatorContext
     ) {
-        return new RankBuilder(rankWindowSize, false) {
+        return new RankBuilder(rankWindowSize) {
             @Override
             protected void doWriteTo(StreamOutput out) throws IOException {
                 // no-op

server/src/test/java/org/elasticsearch/search/rank/RankFeatureShardPhaseTests.java

@@ -117,7 +117,7 @@ public boolean isCancelled() {
     }
 
     private RankBuilder getRankBuilder(final String field) {
-        return new RankBuilder(DEFAULT_RANK_WINDOW_SIZE, false) {
+        return new RankBuilder(DEFAULT_RANK_WINDOW_SIZE) {
             @Override
             protected void doWriteTo(StreamOutput out) throws IOException {
                 // no-op

test/framework/src/main/java/org/elasticsearch/search/rank/TestRankBuilder.java

@@ -52,7 +52,7 @@ public static TestRankBuilder randomRankBuilder() {
     }
 
     public TestRankBuilder(int windowSize) {
-        super(windowSize, false);
+        super(windowSize);
     }
 
     public TestRankBuilder(StreamInput in) throws IOException {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/random/RandomRankBuilder.java

@@ -61,7 +61,7 @@ public class RandomRankBuilder extends RankBuilder {
     private final Integer seed;
 
     public RandomRankBuilder(int rankWindowSize, String field, Integer seed) {
-        super(rankWindowSize, false);
+        super(rankWindowSize);
 
         if (field == null || field.isEmpty()) {
             throw new IllegalArgumentException("field is required");

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankBuilder.java

@@ -36,6 +36,7 @@
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.FIELD_FIELD;
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.INFERENCE_ID_FIELD;
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.INFERENCE_TEXT_FIELD;
+import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.LENIENT_FIELD;
 import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.MIN_SCORE_FIELD;
 
 /**
@@ -75,6 +76,7 @@ public class TextSimilarityRankBuilder extends RankBuilder {
     private final String inferenceText;
     private final String field;
     private final Float minScore;
+    private final boolean lenient;
 
     public TextSimilarityRankBuilder(
         String field,
@@ -84,11 +86,12 @@ public TextSimilarityRankBuilder(
         Float minScore,
         boolean lenient
     ) {
-        super(rankWindowSize, lenient);
+        super(rankWindowSize);
         this.inferenceId = inferenceId;
         this.inferenceText = inferenceText;
         this.field = field;
         this.minScore = minScore;
+        this.lenient = lenient;
     }
 
     public TextSimilarityRankBuilder(StreamInput in) throws IOException {
@@ -98,6 +101,11 @@ public TextSimilarityRankBuilder(StreamInput in) throws IOException {
         this.inferenceText = in.readString();
         this.field = in.readString();
         this.minScore = in.readOptionalFloat();
+        if (in.getTransportVersion().onOrAfter(TransportVersions.LENIENT_RERANKERS)) {
+            this.lenient = in.readBoolean();
+        } else {
+            this.lenient = false;
+        }
     }
 
     @Override
@@ -112,22 +120,28 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public void doWriteTo(StreamOutput out) throws IOException {
-        // rankWindowSize & lenient serialization is handled by the parent class RankBuilder
+        // rankWindowSize serialization is handled by the parent class RankBuilder
         out.writeString(inferenceId);
         out.writeString(inferenceText);
         out.writeString(field);
         out.writeOptionalFloat(minScore);
+        if (out.getTransportVersion().onOrAfter(TransportVersions.LENIENT_RERANKERS)) {
+            out.writeBoolean(lenient);
+        }
     }
 
     @Override
     public void doXContent(XContentBuilder builder, Params params) throws IOException {
-        // rankWindowSize & lenient serialization is handled by the parent class RankBuilder
+        // rankWindowSize serialization is handled by the parent class RankBuilder
         builder.field(INFERENCE_ID_FIELD.getPreferredName(), inferenceId);
         builder.field(INFERENCE_TEXT_FIELD.getPreferredName(), inferenceText);
         builder.field(FIELD_FIELD.getPreferredName(), field);
         if (minScore != null) {
             builder.field(MIN_SCORE_FIELD.getPreferredName(), minScore);
         }
+        if (lenient) {
+            builder.field(LENIENT_FIELD.getPreferredName(), lenient);
+        }
     }
 
     @Override
@@ -187,7 +201,7 @@ public RankFeaturePhaseRankCoordinatorContext buildRankFeaturePhaseCoordinatorCo
             inferenceId,
             inferenceText,
             minScore,
-            isLenient()
+            lenient
         );
     }
 

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/rrf/RRFRankBuilder.java

@@ -79,7 +79,7 @@ public void doXContent(XContentBuilder builder, Params params) throws IOExceptio
     private final int rankConstant;
 
     public RRFRankBuilder(int rankWindowSize, int rankConstant) {
-        super(rankWindowSize, false);
+        super(rankWindowSize);
 
         if (rankConstant < 1) {
             throw new IllegalArgumentException("[rank_constant] must be greater or equal to [1] for [rrf]");