IndexOptions don't need to implement Writeable

Author: kderusso

server/src/main/java/org/elasticsearch/cluster/metadata/SemanticTextIndexOptions.java

@@ -12,8 +12,6 @@
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
@@ -35,7 +33,7 @@
  *    }
  *  }
  */
-public class SemanticTextIndexOptions implements ToXContent, Writeable {
+public class SemanticTextIndexOptions implements ToXContent {
 
     private static final String TYPE_FIELD = "type";
 
@@ -52,12 +50,6 @@ public SemanticTextIndexOptions(StreamInput in) throws IOException {
         this.indexOptions = IndexOptions.readIndexOptions(in);
     }
 
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(type.value);
-        indexOptions.writeTo(out);
-    }
-
     public SupportedIndexOptions type() {
         return type;
     }

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

@@ -1342,15 +1342,6 @@ final boolean validateElementType(ElementType elementType, boolean throwOnError)
             return validElementType;
         }
 
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeEnum(type);
-            doWriteTo(out);
-        }
-
-        protected abstract void doWriteTo(StreamOutput out) throws IOException;
-
         public abstract boolean updatableTo(DenseVectorIndexOptions update);
 
         public boolean validateDimension(int dim) {
@@ -1403,13 +1394,6 @@ abstract static class QuantizedIndexOptions extends DenseVectorIndexOptions {
             super(in);
             this.rescoreVector = in.readOptionalWriteable(RescoreVector::new);
         }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeOptionalWriteable(rescoreVector);
-            doWriteTo(out);
-        }
     }
 
     public enum VectorIndexType {
@@ -1742,12 +1726,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new Int8FlatIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeOptionalFloat(confidenceInterval);
-        }
-
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject();
@@ -1804,11 +1782,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new FlatIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            // no additional fields to write
-        }
-
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject();
@@ -1867,14 +1840,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new Int4HnswIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeInt(m);
-            out.writeInt(efConstruction);
-            out.writeFloat(confidenceInterval);
-        }
-
         @Override
         public KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -1957,11 +1922,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new Int4FlatIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            out.writeFloat(confidenceInterval);
-        }
-
         @Override
         public KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -2033,13 +1993,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new Int8HnswIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            out.writeInt(m);
-            out.writeInt(efConstruction);
-            out.writeFloat(confidenceInterval);
-        }
-
         @Override
         public KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -2132,12 +2085,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new HnswIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            out.writeInt(m);
-            out.writeInt(efConstruction);
-        }
-
         @Override
         public KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             if (elementType == ElementType.BIT) {
@@ -2209,12 +2156,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new BBQHnswIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            out.writeInt(m);
-            out.writeInt(efConstruction);
-        }
-
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -2278,11 +2219,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new BBQFlatIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            // no additional fields to write
-        }
-
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -2349,13 +2285,6 @@ public IndexOptions readFrom(StreamInput in) throws IOException {
             return new BBQIVFIndexOptions(in);
         }
 
-        @Override
-        public void doWriteTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeVInt(clusterSize);
-            out.writeVInt(defaultNProbe);
-        }
-
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
@@ -2979,19 +2908,6 @@ public FieldMapper.Builder getMergeBuilder() {
         return new Builder(leafName(), indexCreatedVersion).init(this);
     }
 
-    @Override
-    public void doValidate(MappingLookup mappers) {
-        if (indexOptions instanceof BBQIVFIndexOptions && mappers.nestedLookup().getNestedParent(fullPath()) != null) {
-            throw new IllegalArgumentException(
-                "["
-                    + CONTENT_TYPE
-                    + "] fields with index type ["
-                    + indexOptions.type
-                    + "] cannot be indexed if they're within [nested] mappings"
-            );
-        }
-    }
-
     private static DenseVectorIndexOptions parseIndexOptions(String fieldName, Object propNode, IndexVersion indexVersion) {
         @SuppressWarnings("unchecked")
         Map<String, ?> indexOptionsMap = (Map<String, ?>) propNode;

server/src/main/java/org/elasticsearch/index/mapper/vectors/IndexOptions.java

@@ -19,20 +19,12 @@
 /**
  * Represents general index options that can be attached to a semantic or vector field.
  */
-public abstract class IndexOptions implements ToXContent, Writeable {
+public abstract class IndexOptions implements ToXContent {
 
     public IndexOptions() {}
 
     public abstract IndexOptions readFrom(StreamInput in) throws IOException;
 
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(getClass().getName());
-        doWriteTo(out);
-    }
-
-    protected abstract void doWriteTo(StreamOutput out) throws IOException;
-
     public static IndexOptions readIndexOptions(StreamInput in) throws IOException {
         String className = in.readString(); // Read the class name from the input
         try {