diff --git a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java index 56712153000dd..d543b70b27092 100644 --- a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java @@ -176,7 +176,7 @@ public static HighlightBuilder highlight() { private boolean trackScores = false; - private Boolean includeNamedQueriesScore = false; + private Boolean includeNamedQueriesScore; private Integer trackTotalHitsUpTo; @@ -262,7 +262,6 @@ public SearchSourceBuilder(StreamInput in) throws IOException { terminateAfter = in.readVInt(); timeout = in.readOptionalTimeValue(); trackScores = in.readBoolean(); - includeNamedQueriesScore = in.readOptionalBoolean(); version = in.readOptionalBoolean(); seqNoAndPrimaryTerm = in.readOptionalBoolean(); extBuilders = in.readNamedWriteableList(SearchExtBuilder.class); @@ -280,6 +279,9 @@ public SearchSourceBuilder(StreamInput in) throws IOException { searchPipelineSource = in.readMap(); } } + if (in.getVersion().onOrAfter(Version.V_3_0_0)) { + includeNamedQueriesScore = in.readOptionalBoolean(); + } } @Override @@ -326,7 +328,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVInt(terminateAfter); out.writeOptionalTimeValue(timeout); out.writeBoolean(trackScores); - out.writeOptionalBoolean(includeNamedQueriesScore); out.writeOptionalBoolean(version); out.writeOptionalBoolean(seqNoAndPrimaryTerm); out.writeNamedWriteableList(extBuilders); @@ -346,6 +347,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeMap(searchPipelineSource); } } + if (out.getVersion().onOrAfter(Version.V_3_0_0)) { + out.writeOptionalBoolean(includeNamedQueriesScore); + } } /**