remove obsolete flags in IndexRequest

Author: mosche

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -179,6 +179,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_00_0);
     public static final TransportVersion INFERENCE_DONT_PERSIST_ON_READ = def(8_776_00_0);
     public static final TransportVersion SIMULATE_MAPPING_ADDITION = def(8_777_00_0);
+    public static final TransportVersion INDEX_REQUEST_REMOVE_ORIGIN_FLAGS = def(8_778_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -148,10 +148,6 @@ public class IndexRequest extends ReplicatedWriteRequest<IndexRequest> implement
     private Object rawTimestamp;
     private long normalisedBytesParsed = -1;
 
-    // FIXME remove flags
-    private boolean originatesFromUpdateByScript;
-    private boolean originatesFromUpdateByDoc;
-
     public IndexRequest(StreamInput in) throws IOException {
         this(null, in);
     }
@@ -203,16 +199,13 @@ public IndexRequest(@Nullable ShardId shardId, StreamInput in) throws IOExceptio
             requireDataStream = false;
         }
 
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN)) {
-            originatesFromUpdateByScript = in.readBoolean();
-        } else {
-            originatesFromUpdateByScript = false;
+        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN)
+            && in.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_ORIGIN_FLAGS)) {
+            in.readBoolean();
         }
-
-        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_DOC_ORIGIN)) {
-            originatesFromUpdateByDoc = in.readBoolean();
-        } else {
-            originatesFromUpdateByDoc = false;
+        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_DOC_ORIGIN)
+            && in.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_ORIGIN_FLAGS)) {
+            in.readBoolean();
         }
     }
 
@@ -775,12 +768,14 @@ private void writeBody(StreamOutput out) throws IOException {
             out.writeZLong(normalisedBytesParsed);
         }
 
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN)) {
-            out.writeBoolean(originatesFromUpdateByScript);
+        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_SCRIPT_ORIGIN)
+            && out.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_ORIGIN_FLAGS)) {
+            out.writeBoolean(false);
         }
 
-        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_DOC_ORIGIN)) {
-            out.writeBoolean(originatesFromUpdateByDoc);
+        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_REQUEST_UPDATE_BY_DOC_ORIGIN)
+            && out.getTransportVersion().before(TransportVersions.INDEX_REQUEST_REMOVE_ORIGIN_FLAGS)) {
+            out.writeBoolean(false);
         }
     }