wee

Author: original-brownbear

server/src/main/java/org/elasticsearch/common/bytes/ReleasableBytesReference.java

@@ -178,6 +178,12 @@ public ReleasableBytesReference readReleasableBytesReference() throws IOExceptio
                 return retainAndSkip(len);
             }
 
+            @Override
+            public ReleasableBytesReference readReleasableBytesReference2() throws IOException {
+                final int len = readInt();
+                return retainAndSkip(len);
+            }
+
             @Override
             public ReleasableBytesReference readAllToReleasableBytesReference() throws IOException {
                 return retainAndSkip(length() - offset());

server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java

@@ -109,7 +109,7 @@ private Referencing(T reference) {
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             if (out.getTransportVersion().onOrAfter(TransportVersions.COMPRESS_DELAYABLE_WRITEABLE)) {
-                out.writeWithSizePrefixAndCompressed(reference);
+                out.writeWithSizePrefix2(reference);
             } else {
                 out.writeWithSizePrefix(reference);
             }

server/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java

@@ -47,6 +47,11 @@ public ReleasableBytesReference readReleasableBytesReference() throws IOExceptio
         return delegate.readReleasableBytesReference();
     }
 
+    @Override
+    public ReleasableBytesReference readReleasableBytesReference2() throws IOException {
+        return delegate.readReleasableBytesReference2();
+    }
+
     @Override
     public boolean supportReadAllToReleasableBytesReference() {
         return delegate.supportReadAllToReleasableBytesReference();

server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java

@@ -13,9 +13,11 @@
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.bytes.CompositeBytesReference;
+import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.recycler.Recycler;
 import org.elasticsearch.core.Releasable;
 import org.elasticsearch.core.Releasables;
+import org.elasticsearch.core.Streams;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -177,6 +179,20 @@ public void writeWithSizePrefix(Writeable writeable) throws IOException {
         }
     }
 
+    @Override
+    public void writeWithSizePrefix2(Writeable writeable) throws IOException {
+        long pos = position();
+        skip(Integer.BYTES);
+        try (var out = new OutputStreamStreamOutput(CompressorFactory.COMPRESSOR.threadLocalOutputStream(Streams.noCloseStream(this)))) {
+            out.setTransportVersion(getTransportVersion());
+            writeable.writeTo(out);
+        }
+        long newPos = position();
+        seek(pos);
+        writeInt(Math.toIntExact(newPos - pos - Integer.BYTES));
+        seek(newPos);
+    }
+
     // overridden with some code duplication the same way other write methods in this class are overridden to bypass StreamOutput's
     // intermediary buffers
     @Override

server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java

@@ -142,6 +142,10 @@ public BytesReference readSlicedBytesReference() throws IOException {
         return readBytesReference();
     }
 
+    public BytesReference readSlicedBytesReference(int bytes) throws IOException {
+        return readBytesReference(bytes);
+    }
+
     /**
      * Checks if this {@link InputStream} supports {@link #readAllToReleasableBytesReference()}.
      */

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -146,7 +146,7 @@ public void writeWithSizePrefix(Writeable writeable) throws IOException {
      *
      * @param writeable {@link Writeable} to serialize
      */
-    public void writeWithSizePrefixAndCompressed(Writeable writeable) throws IOException {
+    public void writeWithSizePrefix2(Writeable writeable) throws IOException {
         final BytesStreamOutput tmp = new BytesStreamOutput();
         try (var o = new OutputStreamStreamOutput(CompressorFactory.COMPRESSOR.threadLocalOutputStream(tmp))) {
             o.setTransportVersion(version);