Migrate Streamable to writeable for index package (#37381)

Migrate streamable classes from index package to Writeable and clean up access modifiers

Related to #34389

Author: Like

server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

@@ -228,22 +228,22 @@ public CommonStats(IndicesQueryCache indicesQueryCache, IndexShard indexShard, C
     }
 
     public CommonStats(StreamInput in) throws IOException {
-        docs = in.readOptionalStreamable(DocsStats::new);
-        store = in.readOptionalStreamable(StoreStats::new);
-        indexing = in.readOptionalStreamable(IndexingStats::new);
-        get = in.readOptionalStreamable(GetStats::new);
+        docs = in.readOptionalWriteable(DocsStats::new);
+        store = in.readOptionalWriteable(StoreStats::new);
+        indexing = in.readOptionalWriteable(IndexingStats::new);
+        get = in.readOptionalWriteable(GetStats::new);
         search = in.readOptionalWriteable(SearchStats::new);
-        merge = in.readOptionalStreamable(MergeStats::new);
-        refresh =  in.readOptionalStreamable(RefreshStats::new);
-        flush =  in.readOptionalStreamable(FlushStats::new);
-        warmer =  in.readOptionalStreamable(WarmerStats::new);
-        queryCache = in.readOptionalStreamable(QueryCacheStats::new);
-        fieldData =  in.readOptionalStreamable(FieldDataStats::new);
-        completion =  in.readOptionalStreamable(CompletionStats::new);
-        segments =  in.readOptionalStreamable(SegmentsStats::new);
-        translog = in.readOptionalStreamable(TranslogStats::new);
-        requestCache = in.readOptionalStreamable(RequestCacheStats::new);
-        recoveryStats = in.readOptionalStreamable(RecoveryStats::new);
+        merge = in.readOptionalWriteable(MergeStats::new);
+        refresh = in.readOptionalWriteable(RefreshStats::new);
+        flush = in.readOptionalWriteable(FlushStats::new);
+        warmer = in.readOptionalWriteable(WarmerStats::new);
+        queryCache = in.readOptionalWriteable(QueryCacheStats::new);
+        fieldData = in.readOptionalWriteable(FieldDataStats::new);
+        completion = in.readOptionalWriteable(CompletionStats::new);
+        segments = in.readOptionalWriteable(SegmentsStats::new);
+        translog = in.readOptionalWriteable(TranslogStats::new);
+        requestCache = in.readOptionalWriteable(RequestCacheStats::new);
+        recoveryStats = in.readOptionalWriteable(RecoveryStats::new);
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java

@@ -23,24 +23,33 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 
-public class QueryCacheStats implements Streamable, ToXContentFragment {
+public class QueryCacheStats implements Streamable, Writeable, ToXContentFragment {
 
-    long ramBytesUsed;
-    long hitCount;
-    long missCount;
-    long cacheCount;
-    long cacheSize;
+    private long ramBytesUsed;
+    private long hitCount;
+    private long missCount;
+    private long cacheCount;
+    private long cacheSize;
 
     public QueryCacheStats() {
     }
 
+    public QueryCacheStats(StreamInput in) throws IOException {
+        ramBytesUsed = in.readLong();
+        hitCount = in.readLong();
+        missCount = in.readLong();
+        cacheCount = in.readLong();
+        cacheSize = in.readLong();
+    }
+
     public QueryCacheStats(long ramBytesUsed, long hitCount, long missCount, long cacheCount, long cacheSize) {
         this.ramBytesUsed = ramBytesUsed;
         this.hitCount = hitCount;
@@ -109,11 +118,7 @@ public long getEvictions() {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        ramBytesUsed = in.readLong();
-        hitCount = in.readLong();
-        missCount = in.readLong();
-        cacheCount = in.readLong();
-        cacheSize = in.readLong();
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java

@@ -22,23 +22,30 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeValue;
-import org.elasticsearch.common.xcontent.ToXContent.Params;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 
-public class RequestCacheStats implements Streamable, ToXContentFragment {
+public class RequestCacheStats implements Streamable, Writeable, ToXContentFragment {
 
-    long memorySize;
-    long evictions;
-    long hitCount;
-    long missCount;
+    private long memorySize;
+    private long evictions;
+    private long hitCount;
+    private long missCount;
 
     public RequestCacheStats() {
     }
 
+    public RequestCacheStats(StreamInput in) throws IOException {
+        memorySize = in.readVLong();
+        evictions = in.readVLong();
+        hitCount = in.readVLong();
+        missCount = in.readVLong();
+    }
+
     public RequestCacheStats(long memorySize, long evictions, long hitCount, long missCount) {
         this.memorySize = memorySize;
         this.evictions = evictions;
@@ -75,10 +82,7 @@ public long getMissCount() {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        memorySize = in.readVLong();
-        evictions = in.readVLong();
-        hitCount = in.readVLong();
-        missCount = in.readVLong();
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java

@@ -20,20 +20,19 @@
 package org.elasticsearch.index.engine;
 
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
-
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeValue;
-import org.elasticsearch.common.xcontent.ToXContent.Params;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Iterator;
 
-public class SegmentsStats implements Streamable, ToXContentFragment {
+public class SegmentsStats implements Streamable, Writeable, ToXContentFragment {
 
     private long count;
     private long memoryInBytes;
@@ -79,6 +78,30 @@ public class SegmentsStats implements Streamable, ToXContentFragment {
 
     public SegmentsStats() {}
 
+    public SegmentsStats(StreamInput in) throws IOException {
+        count = in.readVLong();
+        memoryInBytes = in.readLong();
+        termsMemoryInBytes = in.readLong();
+        storedFieldsMemoryInBytes = in.readLong();
+        termVectorsMemoryInBytes = in.readLong();
+        normsMemoryInBytes = in.readLong();
+        pointsMemoryInBytes = in.readLong();
+        docValuesMemoryInBytes = in.readLong();
+        indexWriterMemoryInBytes = in.readLong();
+        versionMapMemoryInBytes = in.readLong();
+        bitsetMemoryInBytes = in.readLong();
+        maxUnsafeAutoIdTimestamp = in.readLong();
+
+        int size = in.readVInt();
+        ImmutableOpenMap.Builder<String, Long> map = ImmutableOpenMap.builder(size);
+        for (int i = 0; i < size; i++) {
+            String key = in.readString();
+            Long value = in.readLong();
+            map.put(key, value);
+        }
+        fileSizes = map.build();
+    }
+
     public void add(long count, long memoryInBytes) {
         this.count += count;
         this.memoryInBytes += memoryInBytes;
@@ -347,27 +370,7 @@ static final class Fields {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        count = in.readVLong();
-        memoryInBytes = in.readLong();
-        termsMemoryInBytes = in.readLong();
-        storedFieldsMemoryInBytes = in.readLong();
-        termVectorsMemoryInBytes = in.readLong();
-        normsMemoryInBytes = in.readLong();
-        pointsMemoryInBytes = in.readLong();
-        docValuesMemoryInBytes = in.readLong();
-        indexWriterMemoryInBytes = in.readLong();
-        versionMapMemoryInBytes = in.readLong();
-        bitsetMemoryInBytes = in.readLong();
-        maxUnsafeAutoIdTimestamp = in.readLong();
-
-        int size = in.readVInt();
-        ImmutableOpenMap.Builder<String, Long> map = ImmutableOpenMap.builder(size);
-        for (int i = 0; i < size; i++) {
-            String key = in.readString();
-            Long value = in.readLong();
-            map.put(key, value);
-        }
-        fileSizes = map.build();
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java

@@ -24,29 +24,36 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;
 
-public class FieldDataStats implements Streamable, ToXContentFragment {
+public class FieldDataStats implements Streamable, Writeable, ToXContentFragment {
 
     private static final String FIELDDATA = "fielddata";
     private static final String MEMORY_SIZE = "memory_size";
     private static final String MEMORY_SIZE_IN_BYTES = "memory_size_in_bytes";
     private static final String EVICTIONS = "evictions";
     private static final String FIELDS = "fields";
-    long memorySize;
-    long evictions;
+    private long memorySize;
+    private long evictions;
     @Nullable
-    FieldMemoryStats fields;
+    private FieldMemoryStats fields;
 
     public FieldDataStats() {
 
     }
 
+    public FieldDataStats(StreamInput in) throws IOException {
+        memorySize = in.readVLong();
+        evictions = in.readVLong();
+        fields = in.readOptionalWriteable(FieldMemoryStats::new);
+    }
+
     public FieldDataStats(long memorySize, long evictions, @Nullable FieldMemoryStats fields) {
         this.memorySize = memorySize;
         this.evictions = evictions;
@@ -84,9 +91,7 @@ public FieldMemoryStats getFields() {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        memorySize = in.readVLong();
-        evictions = in.readVLong();
-        fields = in.readOptionalWriteable(FieldMemoryStats::new);
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/flush/FlushStats.java

@@ -23,13 +23,14 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 
-public class FlushStats implements Streamable, ToXContentFragment {
+public class FlushStats implements Streamable, Writeable, ToXContentFragment {
 
     private long total;
     private long periodic;
@@ -39,6 +40,14 @@ public FlushStats() {
 
     }
 
+    public FlushStats(StreamInput in) throws IOException {
+        total = in.readVLong();
+        totalTimeInMillis = in.readVLong();
+        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
+            periodic = in.readVLong();
+        }
+    }
+
     public FlushStats(long total, long periodic, long totalTimeInMillis) {
         this.total = total;
         this.periodic = periodic;
@@ -112,11 +121,7 @@ static final class Fields {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        total = in.readVLong();
-        totalTimeInMillis = in.readVLong();
-        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
-            periodic = in.readVLong();
-        }
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/get/GetStats.java

@@ -22,13 +22,14 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
 
-public class GetStats implements Streamable, ToXContentFragment {
+public class GetStats implements Streamable, Writeable, ToXContentFragment {
 
     private long existsCount;
     private long existsTimeInMillis;
@@ -39,6 +40,14 @@ public class GetStats implements Streamable, ToXContentFragment {
     public GetStats() {
     }
 
+    public GetStats(StreamInput in) throws IOException {
+        existsCount = in.readVLong();
+        existsTimeInMillis = in.readVLong();
+        missingCount = in.readVLong();
+        missingTimeInMillis = in.readVLong();
+        current = in.readVLong();
+    }
+
     public GetStats(long existsCount, long existsTimeInMillis, long missingCount, long missingTimeInMillis, long current) {
         this.existsCount = existsCount;
         this.existsTimeInMillis = existsTimeInMillis;
@@ -136,11 +145,7 @@ static final class Fields {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        existsCount = in.readVLong();
-        existsTimeInMillis = in.readVLong();
-        missingCount = in.readVLong();
-        missingTimeInMillis = in.readVLong();
-        current = in.readVLong();
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override